added collisions
Merge branch 'master' of github.com:acus512/stlgamejam_sept2013