added more quiz controller logic
fixed merge conflict
Merge branch 'master' of https://github.com/vikramraja/mathquiz
quiz show page now works... kinda
merged