modified:   server_system_test.cc

	modified:   server_system_test.cc
	modified:   server_system_test.cc
Merge branch 'master' of github.com:srcvirus/klink

Conflicts:
	server_system_test.cc