Fixed collisions
Merge branch 'master' of https://github.com/Rwprice/Ludum-Dare-30