Fixed conflicts.
Merge branch 'master' of github.com:fireant/cardgame