Admin user can successfully login

Admin is shown a welcome message
invalid emails are shown an error message and redirected to login
Merge branch 'master' of github.com:gSchool/g2-store

Conflicts:
	app/assets/stylesheets/application.css
	config/routes.rb
Resolved merge conflict

deleted duplication in routes