Nikhil's changes to the master to incorporate the features in User branch
Merge branch 'master' of https://github.com/bazookan/Quiz_app