few changes
settled merge conflict
Merge pull request #32 from fiddler-crabs-2014/debug-user_decks

Debug user decks