Merge pull request #1 from Ragzouken/master

base stuff
Merge pull request #2 from Ragzouken/master

map base
water tile
Merge pull request #3 from Claire1605/master

water tile
basic structure for player
merge