real proj
Merge branch 'master' of https://github.com/SlavianaKaziuko/Diplom

Conflicts:
	диаграмма.eap