no cube
Merge branch 'master' of git@github.com:ssachtleben/herowar.git

Conflicts:
	app/assets/javascripts/game/application.coffee