s
Merge branch 'master' of https://github.com/tverrkraftig/technical-report

Conflicts:
	report.pdf
Merge branch 'master' of https://github.com/tverrkraftig/technical-report

Conflicts:
	report.pdf