Merge branch 'master' of https://github.com/Shubhang91/18649_Portfolio

Conflicts:
	portfolio_template/reqs/requirements2.html
ady