Added web-mode
Merge branch 'master' of github.com:iqbalansari/dotEmacs

Conflicts:
	customizations/keybindings.el
	customizations/packages.el