Shutting down sockets and waiting for threads to end
Merge branch 'master' into ubuntu
Got rid of warning messages when compiling gui.c
Merge branch 'master' into ubuntu