Removed some errors
Merge branch 'master' of https://github.com/wilczogon/LakeProject

Conflicts:
	src/com/edu/agh/student/lakeproject/lakeworld/LakeObject.java