update
Merge branch 'rspec-testing' of https://github.com/wilchandler/exitslips into rspec-testing
Merge branch 'master' of https://github.com/wilchandler/exitslips into capybara-testing-of-sections
updated from master
added association to quizzes and changed index view for quizzes
Merge branch 'master' of https://github.com/wilchandler/exitslips