Fixed weird merge conflict
Still getting used to this GitHub thingy
Added documentation
Water tank is pretty much done. Might do a bit of testing before merging.