Working on the server ftw
Merge branch 'master' of https://github.com/jameslockhart/rally8