Remove extraneous "one side of" verbiage from Merge example
Refine description and merge conflict example
Update .gitgnore bullet point descriptions
Merge pull request #186 from github/slide-content-tidy

Clean up slide content and text