increment numTimesTaken on DB
fix merge conflicts
Merge branch 'master' of https://github.com/amybear/quiz