Change database names; get working on Bobs computer
Merge branch 'master' into bob-branch
Merge Daniel's changes
Fix travis link (branch master now)
Merge branch 'master' into bob-branch
Make daniel edits
Reformat code
Add cors to package.json