wei edit quiz
Merge branch 'wei'