Refactoring serverside code
Transfered updated client code to server
Merged changes
Merge branch 'master' of https://github.com/rmtmckenzie/seng-426-group5