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'