Adds basic mesh for water
Basic changes to the Main
Merge branch 'master' of https://github.com/nottu/BatallaNaval

Conflicts:
	.gitignore