Merge branch 'master' of github.com:jontelang/Game1

Conflicts:
	README.md
Merge branch 'master' of github.com:jontelang/Game1