Quiz

Merge last code updates from end of spring term