Server finished
Merge branch 'master' of github.com:boolinc/cpco7karaoke