First Commit + ProxyProc.c
Merge branch 'master' of https://github.com/SteadyMitch/ConcurrentWebProxy

Conflicts:
	Makefile
	proxy.c