Merge branch 'dev' of https://github.com/foundersandcoders/camdenmaps into dev
Swagger
fixes merge conflicts
fixes conflicts with swagger and local information
api swagger build
Merge branch 'dev' of https://github.com/foundersandcoders/camdenmaps into dev
Merge branch 'dev' into swaggerBuild
indenting in html
added tests to test options
adds swagger documentation
swagger page added, json converted from yaml
resolveed merge conflicts
Merge branch 'dev' into swaggerBuild
added glue to package.json for future use
adding a few ore bits of potential acceptance criteria to continue to add to
moves json2yaml and js-yaml to devdependencies
Merge pull request #49 from foundersandcoders/swaggerBuild

Swagger build
Merge pull request #50 from foundersandcoders/acceptance-tests

Acceptance tests
fixes merge conflicts