git config --global core.editor notepad.exe
Merge branch 'master' of https://github.com/vasya35/test