wrote abstract
Merge branch 'master' of github.com:axelmartensson/etsa05

Conflicts:
	report.tex