Removed -Werror from Makefile
Fully implemented water