add test.txt
git command
Merge branch 'master' of https://github.com/alamod951753/20141214_Git_p1