added allison's quiz
merge