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

Conflicts:
QuizzyDatabase