changes in requirements.txt
Merge https://github.com/khushbu14/webportal
done
done
finally
correction in templates
Merge branch 'master' of https://github.com/priyamvadachundawat/webportal into priyamvadachundawat-master

Conflicts:
	static/css/freelancer.css
	templates/base.html
	templates/content.html
	templates/contributor_subject.html
	templates/reviewer_past_approvals.html
	templates/reviewer_subject.html
	templates/webapp/index.html
	webportal/urls.py
Merge branch 'priyamvadachundawat-master'

Conflicts:
	templates/content.html
	templates/contributor_subject.html
	templates/reviewer_past_approvals.html
	templates/reviewer_subject.html
Merge branch 'master' of https://github.com/khushbu14/webportal