Added todos
Merge branch 'master' of https://github.com/Felorati/scalability
Merge branch 'master' of https://github.com/Felorati/scalability

Conflicts:
	Report/worksheets/characteristics/characteristics.tex