Merge Conflict
Really fixed
Merge pull request #4 from Adrian-Pask/FixedDecks

Fixed decks