bugfix
Merge branch 'master' of https://github.com/jason0037/lab

Conflicts:
	tmp/pids/server.pid