report Sebastian
Merge branch 'master' of https://github.com/SL2Team/sl2

Conflicts:
	doc/report/report.pdf
	doc/report/report.tex
updated report.pdf