Server and Client projects
Merge branch 'master' of https://github.com/jackbatzner/COEN-4720