adding first commit - WIP
Merge branch 'master' of https://github.com/phaus/proxyhost

Conflicts:
	.gitignore
	LICENSE