json-modeを追加した
Add helm
Fix .gitignore
Merge branch 'master' of github.com:shigemk2/.emacs.d

Conflicts:
	.gitignore
	.gitmodules
	init.el