nearly functional
Merge remote-tracking branch 'origin/master'

Conflicts:
	game.js
	index_home.js
	public/css/game.css
	public/js/game.js
	tpl/game.jade