add test.txt
edit c.txt
Merge branch 'new' of github.com:twopiece/sitcon