commit message
coflict test
Merge pull request #7 from mironovaOlga/master

commit message