Merged new decks, rearranged deck order, cleaned up decks
Fixed deck order, again
Merge pull request #51 from Rylius/deck-updates

Deck updates