changed Graham's dumb database name to real one
Merge branch 'master' of https://github.com/elanas/Shuq