REAL unbroken code
[JT] rebase and commit
Merge branch 'master' of https://github.com/harmoli/FinalProject-PBDWater
FIXED