Much of the server code.
Merge branch 'master' of https://github.com/sainsley/artbark