the last few cards in the deck are always drawn, not shuffled
travis-ci should only run on master
GameState now keeps track of cards in play with a map
fix haddock for rotate
Merge remote-tracking branch 'upstream/master'
adding the rest of the cards for intrigue (no definitions of the effects yet)
working on getting the effects of these cards implemented
Merge branch 'adit/intrigue' of github.com:egonSchiele/dominion into adit/intrigue