Conclusion v2.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	report/report.tex
Merge branch 'master' of github.com:Teleseminar-project11/Docs