bashrc:エラー修正
Merge branch 'master' of https://github.com/Disuke/dotfiles
Makefile:emacs追加
emacs:補完機能追加