Merge pull request #3 from manpreetssethi/manpreet

Manpreet
fixes
fixed conflicts
removed appsettings
Merge branch 'divyansh' of github.com:manpreetssethi/new_scientist into divyansh
quiz page work
Merge pull request #4 from manpreetssethi/divyansh

Divyansh