coloured player
Merge branch 'master' of https://github.com/TerranceN/GGJ2014
Added separate collision for platforms
Merge branch 'collision'
terrance please
conflict resolved (merging)
Fixed bug where side collision didn't work when falling
Added predictive collision checking based on where the user is about to end up