merge conflict local 2
Merge branch 'master' of https://github.com/johannesboyne/howtousegit

Conflicts:
	README.md