Preparatory changes
Merge branch 'master' of https://github.com/BBK-PiJ-2012-86/Poker.git