Add login and signup forms to main page
Add helper, modify user controller to allow for authenticated login
Add login and signup forms to main page
Add helper, modify user controller to allow for authenticated login
finish decks
Modify authentication params and small bug, works
Merge pull request #3 from aedwards12/Anthony_edwards_Views

Add card new
Fix merge issue
Add validation to user model - but commented out
Merge changes in master into this branch
Merge pull request #5 from aedwards12/user

User
all decks clear
all decks clear..... i think
Merge pull request #6 from aedwards12/decks

all decks clear
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
Connect Deck View to Card View