Merge pull request #30 from wisthy/develop

create the develop branch to reflect the suggested GIT usage model and push the hybrid solution for Toops#29
Continued work on cement fluid

Wet cement is now kinda working
Merge pull request #9 from Toops/master

refresh from upstream