Fixed up some game logic and tidied up Task list. Also added checks to
make sure only valid cards are created.
Merge remote-tracking branch 'origin/master'