sda
Merge remote-tracking branch 'origin/master'

Conflicts:
	Projekt2/src/Server/Server.java