delete this commit?
Merge branch 'master' of https://github.com/jamesrobertcarthew/cpid

Conflicts:
	cpid_server.py