Combined naive + spatialhash

if number of particles is greater than a certain amount, switch to
spatialhash
Merge branch 'master' of https://github.com/h-wang94/cs184final