write bar bar to readme.txt
Merge branch 'master' of https://github.com/GettingStartedAccount/myrepo
Conflicts: readme.txt (foo+bar)