Getting index.js so that it properly reads/writes to our db.json
Merge branch 'master' of https://github.com/decapyre/AngelHack-app

Conflicts:
	web/index.js