refactor, auth works
Merge branch 'testing'

Conflicts:
	Cal/app/controllers/user_controller.rb
	Cal/app/models/user.rb
	Cal/db/schema.rb
refactor, auth works