去掉无用文件的提交
Merge branch 'caow' of https://github.com/swtlovewtt/yikoudai into caow

Conflicts:
	.gitignore