Subject: Removed extra {% endif %} tag from base.html
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
new changes
changes in templates
Merge branch 'priyamvadachundawat-new'
changes in templates
changes in templates
edit in topic page
Merge branch 'topic' of https://github.com/priyanjasingh/webportal into priyanjasingh-topic

Conflicts:
	templates/contributor_topic.html
Merge branch 'priyanjasingh-topic'