Collision. Simple flag with collision
Merge branch 'master' of https://github.com/simeks/Flying-Cookie-Arena-Deluxe

Conflicts:
	Flying-Cookie-Arena-Deluxe/src/client/Character.java
	Flying-Cookie-Arena-Deluxe/src/client/Session.java