Back to basics, particle info now in fluids.h
Merge branch 'master' of https://github.com/jshapira/CIS563-Final