Revert "Re-wrote parts of quiz master"
Merge pull request #12 from NexPB/revert-10-patch-2

Revert "Re-wrote parts of quiz master"