增加忽略文件
Merge branch 'master' of https://github.com/mjxjn/czshop

Conflicts:
	protected/admin/runtime/application.log
更新忽略文件