added fluid description to ch2 of SUM
merging stuff
Merge branch 'master' of https://github.com/Fingerpaint/project-docs