some test for quiz generator
Merge branch 'master' of https://github.com/aehsu/pentimento-MITx
Merge branch 'master' of https://github.com/aehsu/pentimento-MITx
some bug fixes
merge