Made changes to ServerController
Merge branch 'master' of https://github.com/chpatton013/clue