added
Merge branch 'master' of https://github.com/laosiaudi/GUI

Conflicts:
	src/gui/Client.java
	src/gui/Main.java
	src/gui/personal.java