Kool Bokkmarks as in zuckerberg
Merge branch 'master' of
ssh://git@github.com/MattiasHagelin/ChattClient.git

Conflicts:
	ChattClient/src/grupparbete/chattclient/Client.java
	ChattClient/src/grupparbete/chattclient/GUI.java
	ChattClient/src/grupparbete/chattclient/GUIbokmark.java
något