ty n form page
fixed conflicts
Merge branch 'master' of github.com:manpreetssethi/new_scientist into divyansh
Merge pull request #5 from manpreetssethi/divyansh

Divyansh