adding to login erb
Merge branch 'development' of https://github.com/franjohn21/doger_much_wow into development

Conflicts:
	app/controllers/index.rb