merge
Merge branch 'master' of https://github.com/paulmakl/Capstone
Merge branch 'master' of https://github.com/paulmakl/Capstone
broke up updateParticlePosition function and added a shell for check particle collisions