whoops
Revert "whoops"

This reverts commit c33a9b5e31d83711a378d50394937a4be520ec94.
Merge remote-tracking branch 'origin/master' into brian-branch
Fixed, formatting, added local json

Fixed the formatting of the functions in app.js so it should be easier
to read. Added ajax calls so that there should always be data in the
app.