Modify .emacs
Merge branch 'master' of github.com:tatsuya-koyama/MyConfig
Resolve conflict (emacs color)