Change on master locally
Merge branch 'master' of https://github.com/githubteacher/hellogitworld

Conflicts:
	README.txt
Merge branch 'master' of https://github.com/githubteacher/hellogitworld