Updated path for sign in
Merge branch 'master' of https://github.com/ebarr/smile

Conflicts:
	app/controllers/application_controller.rb