sign in/out/up working
Merge branch 'master' of https://github.com/szarmes/448Project

Conflicts:
	app/controllers/application_controller.rb