Update package.json
Merge pull request #5 from ssabpisa/patch-3

Update package.json, missing request
Merge branch 'master' of git://github.com/ssabpisa/oada-test into pat-merge

Conflicts:
	package.json
Merge branch 'pat-merge'
Fixed comment typo in runserver
Merge pull request #10 from abalmos/runserver-comments

Fixed comment typo in runserver
README.md correctly indicates how to start server

npm start is now the preferred method. Currently it calls ./runserver
Merge pull request #11 from abalmos/readme

README.md correctly indicates how to start server
Merge pull request #12 from ssabpisa/master

Addressed the `undefined` steps warning
Actually fixed the runserver license comments
Merge pull request #13 from abalmos/runserver

Actually fixed the runserver license comments
Replaces request with superagent

Fixes #9
Merge pull request #14 from abalmos/superagent

Fixes #9 - Replaces request with superagent
Merge branch 'master' of https://github.com/OADA/oada-test

Conflicts:
	cucumber/features/step_definitions/Demo_Steps.js
	runserver
Merge branch 'master' of github.com:ssabpisa/oada-test