debug
Merge branch 'master' of https://github.com/jsedoc/Penn-CNS-chat

Conflicts:
	include/macros.h