Login Auth
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers.rb
	sandwiches.db
Login Auth