Testing conflicts
Merge remote-tracking branch 'origin/test-branch'

Conflicts:
	http.py
Merge branch 'master' of https://github.com/synap5e/FakeHTTPServers