Refactored JS
Merge branch 'master' of https://github.com/colinurbs/json-notes