whitewhite
Merge branch 'master' of https://github.com/akinnunen/puljautus

Conflicts:
	app/views/game.html
	app/views/score.html