pulling in updates from maclab/game-on
Merge branch 'master' of https://github.com/EzioBallarin/game-on

Conflicts:
	README.md