Addin hello.txt
adding test.txt
adding chao.txt
adding cha2.txt
Merge branch 'feature_x' into parte2