Changes in report
Merge branch 'master' of https://github.com/avoldsund/Optimization-project

Conflicts:
	Latex/report.aux
	Latex/report.log
	Latex/report.pdf
	Latex/report.synctex.gz
Changes in q2 and q7
Merge branch 'master' of https://github.com/avoldsund/Optimization-project