Changed stuff.
no message
Merge branch 'develop' of https://github.com/CST4G/HealthAppSprint2b into develop
git
no message
Merge branch 'develop' of https://github.com/CST4G/HealthAppSprint2b into develop

Conflicts:
	HealthApp/Controllers/ServicesController.cs
added the authentication file. it was untracked before.
Merge branch 'develop' of https://github.com/CST4G/HealthAppSprint2b into develop
no message
Fixed shit
Merge branch 'master'
s