1. Added get_data method in http-proxy.cc
2. add two lines in main method for testing get_data
Merge branch 'master' of github.com:pololee/CS-118-1

Conflicts:
	http-proxy.cc