Piers says I don't do hard work, check out this mofo
Merge branch 'master' of github.com:growse/CRUKGameJamTeamAwesome

Conflicts:
	frontend/assets/js/src/game/GameController.js