updated routes and login logic
Merge branch 'master' of https://github.com/netelder/flashcardsp2 into loginlogic

This merge is necessary to commit changes.
added ajax login
Merge pull request #1 from netelder/loginlogic

Loginlogic
Merge branch 'master' of https://github.com/netelder/flashcardsp2

Conflicts:
	app/controllers/index.rb
build round.erb