增加gitignore
Merge branch 'master' of https://github.com/bigfang/.emacs.d
added magit