okidolki
Merge branch 'master' of github.com:Roxling/EDA031proj

Conflicts:
	Server/Commands/CommandFactory.o

MERGE CONFLICTS!
Merge branch 'master' of github.com:Roxling/EDA031proj

MEREGE SUCCESFUL!