recovering after merge conflicts
Merge branch 'master' of https://github.com/craig8196/math-help-queue