not good
Merge branch 'master' of https://github.com/liangvic/ChunkyMonkeys into travis
added ben's IP address to config file
added test1 method to client servier node
resolved merge conflicts
added ben's IP
Merge branch 'jessica'
Added info for test1
Fixed travis merge conflicts
vic
vic
test 5 in progress