2014.9.17 add a new file named 1.txt
Merge branch 'master' of https://github.com/dunli/test