I changed the readme
Merge https://github.com/hpimentel/game215 into crodeheaver

Conflicts:
	README.md
Merge branch 'master' of https://github.com/hpimentel/game215

Conflicts:
	README.md
	README.md~