ny bokmarkmeny
Merge branch 'master' of git@github.com:MattiasHagelin/ChattClient.git

Conflicts:
	ChattClient/src/grupparbete/chattclient/Connect.java
	ChattClient/src/grupparbete/chattclient/GUI.java
ändrade bookmark GUI