Setting client to run on peters server
Merge remote-tracking branch 'origin/master'