comments
Merge branch 'master' of https://github.com/simeks/Flying-Cookie-Arena-Deluxe

Conflicts:
	Flying-Cookie-Arena-Deluxe/src/client/World.java
Merge branch 'master' of https://github.com/simeks/Flying-Cookie-Arena-Deluxe