Add categories
Add static data
Merge branch 'master' of github.com:tttzof351/httpbin

Conflicts:
	httpbin.py