changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	report/report.pdf
Merge branch 'master' of https://github.com/MrZenji/02820-Project