end convo alert
Merge branch 'master' of https://github.com/jcalvinowens/keychat

Conflicts:
	KeyChat/KeyChat/KCConversationViewController.h