nem emelunk
a
Merge branch 'master' of https://github.com/pityokapoker/ittvan.git

Conflicts:
	src/main/java/org/leanpoker/player/Player.java