removed a template
removed conflict
Merge branch 'master' of https://github.com/khushbu14/webportal
edited contributor page
Merge pull request #25 from priyanjasingh/master

edited home page