source for scale in scale out
giovanni corrections in architecture
Merge branch 'master' of https://github.com/sw701e14/report

Conflicts:
    content/architecture.tex
Merge branch 'master' of https://github.com/sw701e14/report