results
Merge branch 'master' of github.com:AlinaKramar/diploma

Conflicts:
	text/diploma.tex