Stage 4 fully functional v1
Merge branch 'master' of https://github.com/AdiMitEier/dontFakeMe

Conflicts:
	src/main/java/proxy/ProxyCliImpl.java