Merge branch 'rebase_yay'
"merge rebase_yay into master"
Merge branch 'master' of https://github.com/bradpsheehan/quizroom
"merge upstream master"