multiple choice multiple answer
Merge branch 'master' into practice-mode
changed when quiz history on show_quiz
updated user page
updated dates and times
Merge branch 'master' into Eric-other-changes
Merge pull request #47 from kmblake/Eric-other-changes

Eric other changes
let's get quizzical!
Merge branch 'master' into Eric-other-changes
Merge pull request #48 from kmblake/Eric-other-changes

Eric other changes
Back end done
debug and put picture response feedback
debug
Quiz History Page is working
Merge branch 'master' into history
Fixed exception handling
Merge pull request #49 from kmblake/history

History
Merge pull request #50 from kmblake/practice-mode

Practice mode
sync
Merge pull request #51 from kmblake/practice-mode

sync