Merge branch 'master' of https://github.com/nikhilpatil2012/Quizzy

Conflicts:
QuizzyDatabase
Merge pull request #3 from nikhilpatil2012/deadcode

Merge branch 'master' of https://github.com/nikhilpatil2012/Quizzy