user2commit
Merge branch 'master' of https://github.com/shilinggang/omotasTest
Conflicts:test.txt
commit merge user2