Discussion without future works
Merge branch 'master' of https://github.com/timvdalen/2IV35-project

Conflicts:
	assignment1/report/report.synctex.gz