Merge branch 'guesses'
Merge branch 'master' into results
Merge branch 'results'
modified models/round
Added an Animal Deck
Merge branch 'animal_deck'
fix error with deck not saving after association
Merge pull request #17 from avifoxi/fix_seed

fix error with deck not saving after association
navbar logic implemented
adding links to appropriate routes in header
Merge pull request #18 from avifoxi/homepage_view_logic

Homepage view logic
add link to new deck for logged in user on decks show page, add new route in decks, add new file in views
setup user creation and login authentication
adjust route for newdeck creation, and first card
Merge branch 'master' into signup
Merge branch 'signup'
Merge branch 'master' of https://github.com/avifoxi/GOLDFINGERhasflashcards
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