add .gitconfig
Merge branch 'develop' of github.com:tianyatomy/config into develop