Added Some tests for Professor Assignments
fixed merge conflicts
Merge branch 'master' of https://github.com/UManitobaOcho/OchoServer
delete assignment changes
Merge branch 'master' of https://github.com/UManitobaOcho/OchoServer