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

Conflicts:
	DAL/App.Config
	Super-Med-Service/Scripts/Action Scripts/Controllers.js
	Super-Med-Service/Web.config
Routing added

Conflicts:
	Super-Med-Service/Scripts/Action Scripts/Controllers.js
Merge branch 'master' of https://github.com/Daria-Sakura/Super-Med-Service

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