Bug fixes and other changes
Merge branch 'master' of https://github.com/jgrosspietsch/cs342poker.git