Update

-Inserted Jorge's conditional-get code
Merge branch 'Second' of https://github.com/jimunoz1990/CS118_Proj1 into Second

Conflicts:
	http-proxy.cc