Current snapshot of the project
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cz/muni/SimpleGame.java
Current snapshot of the project
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cz/muni/Player.java