temp commit, login mechanism
Merge branch 'master' of https://github.com/Empters/HealthPriority
Merge branch 'master' of https://github.com/Empters/HealthPriority

Conflicts:
	db/schema.rb