Refactored the EchoServer Assigment to use in our CA1 project
Merge origin/master