text file
add name
Delete name.txt
Merge branch 'master' of https://github.com/ppamm/proj1
ok
ok 1
ok
name changed
Merge pull request #2 from ppamm/master

Master