Changed order, some cleanups
Added images to branching etc and fixed code formatting
Merge branch 'master' of https://github.com/ffossum/git-course

Conflicts:
	index.html