Attempt to merge with conflicting file.
Merge branch 'master' of https://github.com/johng12/cudaSPH

Conflicts:
	cudaSPH/src/particles.cpp