init
Merge branch 'master' of https://github.com/jendave/magic-proxy

Conflicts:
	.gitignore
	README.md