Edit form for deck - decklist field added
Merge branch 'master' into edit-deck
Deck now saves the cards in the Decklist field as individual cards (yay)
Fixes regexp to find cards
Ordering and capitalizing