added multiple-cursor package
Yasnippet for web-mode
Merge branch 'master' of https://github.com/soulphysics/.emacs.d

Conflicts:
	init.el