Test conflict
Merge branch 'master' of https://github.com/Taddie/HelloGit

Conflicts:
	README.md