wilchandler/exitslips — pull request #23 by nshah20 (2014-10-19 20:24:32+00:00)
Title: Merge conflict fixing

fixed merge conflicts on quizzes