this is broken
Merge branch 'master' of https://github.com/hughybarra/GroupProject
fixed particle collisison