trash
Merge branch 'master' of https://github.com/diez-ukr/em_lab-1

Conflicts:
	em_lab-1/em_lab-1.csproj