Fixed Seg Fault
Merge branch 'master' of https://github.com/mirzael/chat_program