Merge pull request #9 from Blackmoor/master

Copying back to my test version
Added Promo cards and decks, fixed a few flubs
Merge