Added buoyancy
Merge branch 'master' of https://github.com/evanwang22/fluid_sph
header file updated
merge conflict fixed