Removed some out commented code
Merge branch 'master' of https://github.com/hansfilipelo/ChattY

Conflicts:
	gui/chatwindow.cpp
Merge branch 'master' of https://github.com/hansfilipelo/ChattY