Workspace commit
Merge branch 'master' of https://github.com/irynaLv/Diploma

Conflicts:
	.idea/workspace.xml