added synchronized blocks around chunkServerMap
merge conflicts
deleted comments
Merge branch 'master' of https://github.com/liangvic/ChunkyMonkeys
ft
fixed delete from chunk server
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys into jessica
Fixing the chunkserver
Merge branch 'travis24'
ceiling cant hold us