fixed merge, updated quiz_browse
fixed merge
fixed merge
Merge branch 'answers'
Merge branch 'answers'
attempt at fixing merge
fixed merge