Committing Quiz changes
Fixing merge conflicts
Merging