Adding feature1
Edited test.txt in f2 branch
Edited
Added test.txt
Merge branch 'master' of https://github.com/mmusaev/mygit