Merge remote-tracking branch 'kyliau/master'
got the sockets compiling
Merge branch 'master' of login.engin.umich.edu:/afs/umich.edu/user/o/l/olsoni/Public/Aero552Proj
clean up client server socket