changes in templates
Merge branches 'master' and 'master' of https://github.com/khushbu14/webportal

Conflicts:
	templates/content.html