Refactor server and client code a bit
Merge branch 'master' of https://github.com/quiz-ggj2014/quiz