Merge branch 'develop'
Change to document
another minor change
Merge branch 'develop' of github.com:sarahRad/Records-Api

Conflicts:
	trial.html
Merge branch 'develop' of github.com:sarahRad/Records-Api
changes to api