formatted
Merge branch 'dev-maru'

Conflicts:
	game.js