use colors from mock-up
merged conflicts
Merge branch 'testing' of github.com:oerpub/github-book into testing