Initial proxy setup
Final Commit - Proxy setup
Merge branch 'master' into Proxy

Conflicts:
	src/main/java/teamUnknown/immersion/Immersion.java
Merge branch 'Proxy'

Conflicts:
	src/main/java/teamUnknown/immersion/Immersion.java