add gitconfig
Merge remote-tracking branch 'upstream/master'
f
del
Merge pull request #3 from vole2014/master

合并请求