regular
Merge branch 'master' of https://github.com/buck101/p2pserver

Conflicts:
	lab/superpeer/src/thread/ontimethread.cpp