Merge pull request #1 from cheriekeks/master

started working on fluids