update
Merge branch 'master' of https://github.com/galuszkak/djangodash

Conflicts:
	game/static/js/game.js