oops
Merge branch 'gh-pages' of github.com:percolate/api-docs into gh-pages

Conflicts:
	_includes/api.html