;
Merge branch 'master' of https://github.com/rysiekblah/EPAMHackathon2014

Conflicts:
	src/main/java/com/realcoders/bot/Game.java
	src/main/java/com/realcoders/bot/Player.java
a