Edited dependencies in ReadMe
Resolved the merge conflict again
Resolved more conflicts
Added instructions about sqlite to packageJson for deployment
Clean up server file"
"
"
"Clean up server file"
Changed packagejson to replace the db
More changes to pacjageJSON
Reduced query size
Do not make calls to API on every get request
Edited package JSON
Populate db on launch only
Controllers redone
Trying to delete the db
Script to delete db
Restored db
Detailed readme
Finish readme?
Add readme
Merge pull request #61 from azotova/editreadme

Editreadme