web-modeを追加
Merge branch 'master' of github.com:katsusuke/emacs-settings

Conflicts:
	.emacs.el
	.gitmodules