server connect
Merge branch 'master' of https://github.com/tejbirsingh/chocolatevpn

Conflicts:
	bin/chocolatevpn/AES.class