worked in player
Fixed merge
Merge branch 'master' of https://github.com/jimmiebergmann/LD28