Merge branch 'master' of https://github.com/TueVJ/OptFinFinalExam

Conflicts:
	pic/portfoliorevision_portfolio.pdf