add folder
delete test2
Merge branch 'master' of https://github.com/liyanboss/liyan-echo

Conflicts:
	test2.txt