Corrected DataBase.cs (only partially)
Merge branch 'master' of http//github.com/zanikoleh/PMI21_TeachingPractice

Conflicts:
	PMI21_TeachingPractice/PMI21_TeachingPractice/Service/DataBase.cs
Fixed conflict.