initial object collisions with push-back
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster