changing git user
Merge branch 'master' of github.com:DmitryEremenko/Conference-hall