last dq
Merge branch 'master' of github.com:dpisarewski/VSP

Conflicts:
	src/NServer.log
	src/client_1@lab28.log