modified .emacs.d/.gitignore
Merge branch 'master' of github.com:weihong-xad/config