add user login to controller
Merge branch 'master' of https://github.com/cpilegard/mc2_flashcards

Conflicts:
	app/controllers/index.rb
added sign up to layout
Merge branch 'master' of https://github.com/cpilegard/mc2_flashcards