changes in requirements.txt
Merge https://github.com/khushbu14/webportal
bugs fixed
Merge branch 'master' of https://github.com/khushbu14/webportal
correction in template of reviewer past approvals
bugs fixed
correction in contact.html
done
correction in media files
changes in templates
done
finally
Subject: More content added to developer's doc.

Description:

- More content added to developer's doc.
- Sphinx theme changed
- Corrections in user guide
Merge pull request #88 from psachin/docs_reviewed

Subject: More content added to developer's doc.
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
done
done