Added water and started on level 3
Fixing merge errors