Refactored to client and server
Merge branch 'master' of https://github.com/toomanydaves/website