Basic vocab quiz support
Merge branch 'master' of https://github.com/TheMuses/pandora
Merge branch 'master' of https://github.com/BillsJ/pandora