Testting
Merge branch 'master' of https://github.com/danielzheng/bitz-server

Conflicts:
	lib/socket/Makefile.am