update
Merge branch 'gh-pages' of https://github.com/db42/test-api into gh-pages

Conflicts:
	api.json