Refactored the player data
Merge branch 'develop' of github.com:ggj/ggj14 into develop
Fixed item collision