Fixed editor shit
Merge branch 'master' of https://github.com/kuffert/GameJam14