Initial commit
Merge branch 'master' of https://github.com/shouldit/proxy-settings into 2.x

Conflicts:
	README.md