Fixed oes
Merge branch 'master' of https://github.com/Panum/sw701e12

Conflicts:
	exam/slides/scalability.tex