Initial commit
Merge https://github.com/SlavianaKaziuko/Diplom

Conflicts:
	.gitignore