added formatted json for Josh, added vars to js file
Merge branch 'master' of https://github.com/JoshuaDickerson/hackvt-2014
Merge branch 'master' of https://github.com/JoshuaDickerson/hackvt-2014