blabla
Merge branch 'master' of https://github.com/chriscarreau/GameFrameworkJS

Conflicts:
	Game.js