merge

Author: zaradford

README.mkd

@@ -75,7 +75,11 @@ Setup:
 4. Run `npm install` to install the required Node packages.
 5. Run `npm run db-init` to create the necessary tables in PostgreSQL
 6. Optional: Run `npm run seed` to seed the database with test data
+<<<<<<< HEAD
 7. In your [HubSpot public app](https://developers.hubspot.com/docs/api/creating-an-app), add `localhost:3001/oauth-callback` as a redirect URL
+=======
+7. In your [HubSpot public app](https://developers.hubspot.com/docs/api/creating-an-app), add localhost:3001/oauth-callback as a redirect URL
+>>>>>>> 2d5d700 (Update README.mkd)
 8. The app uses the following scopes:
 - crm.schemas.companies.read
 - crm.schemas.companies.write