removed a template
removed conflict
Merge branch 'master' of https://github.com/khushbu14/webportal
basr.html modified
edited contributor page
Merge pull request #25 from priyanjasingh/master

edited home page
done
reviewer part
reviewer part
Merge branch 'master' of https://github.com/khushbu14/webportal
cnjdc nj
CDCDCDC
front-end
Merge branch 'priyamvadachundawat-front'
everything fine
Subject: Removed extra {% endif %} tag from base.html
frontend of first two page
error correction
Merge pull request #28 from priyanjasingh/master

frontend work of first two pages
Merge pull request #27 from psachin/endif_error

Subject: Removed extra {% endif %} tag from base.html