Redone Quiz 7

Revamped to work with help from in class.