ca
Merge branch 'master' of github.com:hackersean/middleware

Conflicts:
	serve
	serve.cpp
	socklib.h.gch
	socklib.o
	strplay.h.gch
	strplay.o
no thing
Merge branch 'master' of github.com:hackersean/middleware

Conflicts:
	c

auto