fix player
Merge branch 'master' of https://github.com/Khoyo/GGJ_2014