changed game.js to new structure
Merge branch 'dev' of https://github.com/sunriseJS/sunriseJS into dev

Conflicts:
	game.js
fixed some bugs