added the JSON parsing thing into app.js
fixed merge conflicts
added functions in app.js to parse the JSON and update the database based on the new information
Merge branch 'master' of https://github.com/ybot1122/be-the-people