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

Conflicts:
	config.h
	serve.cpp
ok