going to conflict
Merge branch 'master' of https://github.com/sberezovsky/Foo

Conflicts: readme.txt
Merge branch 'master' of https://github.com/sberezovsky/Foo