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

Conflicts:
	client.cpp