changes
Merge branch 'master' of https://github.com/jjbeanz/cs485final

Conflicts:
	proxy.c