mmm
Merge branch 'master' of ssh://github.com/MattiasHagelin/ChattClient

Conflicts: fixed
	ChattClient/src/grupparbete/chattclient/Client.java
	ChattClient/src/grupparbete/chattclient/GUI.java
	ChattClient/src/grupparbete/chattclient/GUIbokmark.java
massa bajs
Merge branch 'master' of ssh://github.com/MattiasHagelin/ChattClient

Conflicts:
	ChattClient/Bookmarks.txt
	ChattClient/src/grupparbete/chattclient/Client.java
	ChattClient/src/grupparbete/chattclient/Client.java.conflict
	ChattClient/src/grupparbete/chattclient/GUI.java
	ChattClient/src/grupparbete/chattclient/GUI.java.conflict
	ChattClient/src/grupparbete/chattclient/GUIbokmark.java.conflict
	ChattClient/src/grupparbete/chattclient/LoadThread.java

Bajs
heee
Merge branch 'master' of ssh://github.com/MattiasHagelin/ChattClient

Conflicts:g
	ChattClient/src/grupparbete/chattclient/GUI.java
fix