Start Of Inproxyfication
merge https://github.com/XarisA/Inproxyfication

Conflicts:
	.gitignore
Merge https://github.com/XarisA/Inproxyfication