First part report
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	assignment1/report/report.tex