minor
Merge branch 'master' of github.com:wolves3d/RoomControl

Conflicts:
	client/CommandManager.cpp
rename source -> src
lib