temp commit, login mechanism
Merge branch 'master' of https://github.com/Empters/HealthPriority
Merge pull request #2 from Empters/front_end

Front end
Merge branch 'master' of https://github.com/Empters/HealthPriority

Conflicts:
	db/schema.rb