adsf
Merge branch 'master' of https://github.com/Marszal/DiplomaEditorStandalone

Conflicts:
	black_branch.txt