Added more to stm
Merge branch 'master' of https://github.com/Felorati/scalability

Conflicts:
	Report/setup/bibliography.bib
	Report/worksheets/stm/stm.tex
Manuel fix of merge