server updates
dammit
Merge branch 'master' of https://github.com/foxydot/graypape