忽略跟踪文件或目录
Merge branch 'master' of https://github.com/zf2014/zjp-test