Fix bug in server
Merge branch 'master' of github.com:WuTheFWasThat/Cake