updated with correct coloring and non-funky lines
Merge branch 'master' of https://github.com/jannickj/SystemIntegrationStudy