adding json-mode
Merge branch 'master' of github.com:briansorahan/emacs-setup