Added gui stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/UI.java
Merge branch 'master' of https://github.com/JohnnyChien/VPN