local
Merge branch 'master' of https://github.com/Daria-Sakura/Super-Med-Service

Conflicts:
	Super-Med-Service/Controllers/HomeController.cs
	Super-Med-Service/Scripts/Action Scripts/Controllers.js