created new thread to call join_channel
Merge branch 'master' of https://github.com/kapace/yolo-octo-ninja
fixed stuff
Merge branch 'master' of https://github.com/kapace/yolo-octo-ninja

Conflicts:
	src/client-gui.cpp