add web mode
Merge branch 'master' of https://github.com/viewtao-zy/.emacs.d

Conflicts:
	lisp/init-web-mode.el