org-modeを追加
Makefile space -> TAB
Merge branch 'kirisame' of github.com:Ataro24/mylib into kirisame

Conflicts:
	emacs/emacs.el