Cleanup and README.md
More README
Merge branch 'master' of github.com:trauzti/proxylab

Conflicts:
	Makefile