g
Merge branch 'master' of https://github.com/OlgaChe/testgit

Conflicts:
	.idea/.name
	.idea/copyright/profiles_settings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	.idea/workspace.xml

Test commit