condiitonal collision part1
Merge branch 'master' of https://github.com/TerranceN/GGJ2014