added index and show for decks
added deck and card controller
fixed merge conflicts