add link to new deck for logged in user on decks show page, add new route in decks, add new file in views
adjust route for newdeck creation, and first card
user create new deck, redirect to deck_display page, begin to add cards
last before new master
Merge branch 'master' into user_gen_new_deck
adding signup merge
rename controller files to plural to distinguish from models. add new card route, disply new card form
move card functions to card controller
Created author column in deck and created associations accordingly
Merge branch 'author_column'
Merge branch 'master' into user_gen_new_deck
Merge branch 'user_gen_new_deck'
add input fields to new card view
finish post route for card creation, redirect to error page if card creation error on save
finish card create route from new page, with card creation. on error directs to edit page
Merge branch 'master' into user_gen_new_deck
adding most recent master changes, get ready for some conflict...
created logout and error handling
Merge branch 'logout'
add patch route for card creation
fix conflicts
Merge branch 'user_gen_new_deck'
merging in card functionality