Now suppose the proxy could operate on any size of data
Merge branch 'master' of github.com:seanwangsk/cs118

Conflicts:
	http-proxy.cc