typos and such
Merge branch 'master' of github.com:MartinFaartoft/sigb

Conflicts:
	report2/report_ass2.tex