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'
changes in edit
changes in views.py
jdiksmj
final