commit on file1.txt by user3
Merge branch 'master' of https://github.com/zohari/sandbox