Fixing some noob bugs with militia
t push:wMerge branch 'master' of https://github.com/rstapenhurst/card_game