Fix
Merge branch 'master' of https://github.com/jupblb/Pokerable.git

Conflicts:
	src/Bot.java

Fix?
Fix?