start of thurs night coding
unit 6 labeling
Merge branch 'master' into Andrew
fixing unit4
time to test!
updated hacky localPathToFile param
removed finished TODOs and added unit6 function.
masterserverthread
masterserverthread
removed .close() statements
resolved merge conflicts
changed masterserver
vic's server changes
victest
servernode chnges
victest
IT WORKS
figured out the socket bug
merge finish night
Fixing merge conflicts after moving lots of functions to masterserverthread