Original server and client source, updated to actually compile
Merge branch 'master' of https://github.com/jkernagis2/query