Add new file test.txt
Commit test , one change added , one change not
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/nazghull/test