Merge branch 'master' into matt-local
Added my system sequence diagram. How bad is it?
Merge branch 'matt-local'