Boom!
Merge branch 'master' of github.com:growse/CRUKGameJamTeamAwesome
Merge branch 'master' of github.com:growse/CRUKGameJamTeamAwesome

Conflicts:
	frontend/assets/js/src/game/GameController.js
Cyclic issues resolved :)
Merge branch 'master' of github.com:growse/CRUKGameJamTeamAwesome