a
Merge branch 'master' of https://github.com/alterichhabkb/prog2.git

Conflicts:
	PokerFOC/src/valueObjects/Player.java