bä
Merge branch 'master' of github.com:ohlala/soagamble

Conflicts:
	src/se/lnu/course4dv109/client/Client.java