server derp deleted
Merge branch 'master' of https://github.com/QuantumBox/QB-site