finished linking accounts
finished multiple login
Merge branch 'auth-identity'

Conflicts:
	app/controllers/sessions_controller.rb
	app/helpers/sessions_helper.rb