strange... seems to be uncommitted changes

Fixup uncommited changes.
Merge branch 'master' of https://github.com/padal/report

Conflicts:
	intro/introduction.tex