1233
Merge branch 'master' of https://github.com/Richard1900/learngit

Conflicts:
	learngit/Hello Git.txt