报错的bugfix
加入git忽略commit文件配置
Merge branch 'master' of https://github.com/erainzhong/PFIF

Conflicts:
	.gitignore