Sets merge commit as default when pulling, and other branching changes

[dpshelio]

• changes master to main (also defines as a default at the start of the lesson)
• Uses switch instead of checkout
• Sets default pull action when different stories to create a merge commit
• Adds more information when talking about naming branches.