Beginning some emacs hooks/functions to check stuff out before i commit it to the main repo, alsoan idea to autostart my magit process....
Added json files to js2-mode
Merge branch 'jn-little' into new-master
Merge remote branch 'refs/remotes/origin/jn-big' into new-master