setting up database stuff
Merge branch 'carrier' of github.com:Elffers/SlothShip into database
creates a database line whenever an estimate is made
parses JSON from express, renders it
Merge pull request #8 from Elffers/carrier

Carrier
Merge pull request #7 from Elffers/database

Database
test route
merge conflict
Merge pull request #9 from Elffers/bridge

parses JSON from express, renders it
change routes
merge conflict