revise login
Merge pull request #7 from aedwards12/login_redo

revise login
Add card routes and views
Merge remote-tracking branch 'upstream/master' into Anthony_edwards_Views

Conflicts:
	app/controllers/card.rb
Edit Card Controller
add results page
Connect Deck View to Card View
Merge pull request #9 from aedwards12/Anthony_edwards_Views

Anthony edwards views
Merge pull request #8 from aedwards12/login_redo

add results page
Merge with master
Add migration files to change type of question column