minor stuff
Merge branch 'master' of github.com:ianlee/scalable-server

Conflicts:
	src/main_server.cpp