login view
Merge branch 'master' of github.com:elpassion/elraising

Conflicts:
	config/routes.rb