function prettying and checking
add back data.json, putting mine in private
Merge branch 'master' into gh-pages