finished basic particle collisions
finsihed particle collisions
Merge branch 'master' into gh-pages