Added chat_ack
Merge branch 'master' of https://github.com/DAHeath/green_chat

Conflicts:
	chat_ack.cpp
	chat_ack.hpp