Gp e bnahs
Nu ska de va ganska king. Måste fixa disconnect
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GUI/ServerPane.java