Resolve merge conflict signup view formatting
Add right or wrong view
add play view
modified controller index and select deck index
play doesnt work yet, need to save the state of the card
Fix signup view ugliness, fix index view routes
Merge branch 'release-0' of https://github.com/mathildemouw/DBC_flashcard_project into users_controller
Users controller for signup and login done

Sessions for login users established.  Also fixed some formatting on sign
up view and index routes.  Index routes are now RESTful.
Merge pull request #10 from mathildemouw/users_controller

Users controller

GREAT!
Fix login view to have labels, breaks, and a password field
Merge branch 'release-0' of https://github.com/mathildemouw/DBC_flashcard_project into release-0
Merge pull request #11 from mathildemouw/login

Fix login view to have labels, breaks, and a password field, lgtm
No time for commit msg, we're too good for that
Merge pull request #12 from mathildemouw/Index_View

added question view, looks good!
Merge pull request #14 from mathildemouw/index-view

cool beans
removes lines from non working views
Merge pull request #15 from mathildemouw/views-fix

Yay! One more working page!
Adds the 2 cards routes, with tests for the usecases
Adds a test for non-redirection when the answer is wrong
Need the gemfile for CoolFaker, bro
Add password authentication and pry

We added pry for the purpose of debugging our session bugs.
Refactored Views to implement routes correctly and made page look
a little nicer
Tim and Darren
Merge pull request #17 from mathildemouw/cards_controller

Adding cards controller