started working on water
Merge branch 'master' of github.com:hacklab-turku/luumuhillo

Conflicts:
	source/map.cpp
merged