Merge pull request #8 from manjbhachu/master

First draft of Quiz implementation #1