s
Merge branch 'master' of https://github.com/Roxling/Projekt2.git

Conflicts:
	Projekt2/src/Server/CreateCommand.java