Integrate engine changes from LD48 28 game
Merge branch 'master' of github.com:sgreenlay/Gam