vic's changes
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys
Testing
vic merge
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys
added second port for servers in config
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys into jessica
vic's stash
updated launch
Vic's stash pt 2
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys
vic's changes
Finishing on the locking mechanism
removed File1 data
Fixed lock conflicts
added socket set up code in node classes
fixed merge conflicts
test4 cleaning + changed to CreateToNewFile instead of mistakenly appending
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys