javascript mode
javascript skewer
Merge branch 'master' of C:/workspace/codebase/emacs-config

Conflicts:
	init-emacs.el