Work in progress
Merge branch 'master' of https://github.com/z3ss/SoftwareArchitecture.git