updated DealWithMessage
resolved merge conflicts
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys into jessica
removed HEAD merge conflict
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys into jessica
added back ChunkLocation class and fixed vic's ERRORS