socket stuff
Merge branch 'master' of github.com:antigoliath/PennApps2013S into sockets
Merge branches 'sockets' and 'master'