hackin shit form SIS to new shit
fixed shit

Merge branch 'master' of https://github.com/Adhesion/ld26

Conflicts:
	game/src/controller/GameObjectController.js
see iff this works