delete
Merge branch 'test' of https://github.com/magicboxhan/ZhihuiyaTest into
test

Conflicts:
	201408201631.txt
delete