pull
Merge branch 'master' of https://github.com/DCPagan/Proxy_part2
fixed Makefile