A simple server that should respond to four simple commands
Merge remote-tracking branch 'origin/master'