new image
Merge branch 'master' of https://github.com/karasik/carassius

Conflicts:
	GameProject/bin/client/Client.class
	GameProject/bin/server/Global.class
	GameProject/src/server/Global.java