Added fillable water bodies
Merge branch 'LewisBranch' of https://github.com/reggiegg/emotion into LewisBranch