new masterfeature.txt
New feature1.txt
Merge branch 'newfeature' of https://github.com/tbudis/try_git into newfeature