compile & bug fixes
Merge branch 'master' of github.com:ialu/ialu-chat

Conflicts:
	src/chat.cpp