Added web-mode to emacs
fix merge conflict
another fix!
Merge branch 'master' of https://github.com/jmgpena/dotfiles

Conflicts:
	emacs/init.el