wip
Merge branch 'master' of
http://peterittner@github.com/teeniimoodi/oc-poker.git

Conflicts:
	src/poker/players/BasicPlayer.java