Merge branch 'master' of https://github.com/elwesties/try_git

Conflicts:
octocat.txt
Merge branch 'master' of https://github.com/elwesties/try_git

Conflicts:
	octocat.txt