mal test
Merge branch 'master' of https://github.com/yuanxiliang/test

Conflicts:
	test2/test2.txt
Merge branch 'master' of https://github.com/yuanxiliang/test