resolved some transition issues
Merge branch 'master' of https://github.com/TBaudon/LD29
Merge remote-tracking branch 'remotes/origin/master'