Monday fixes.
Merge branch 'master' of https://github.com/lumikenterprises/github-flow-workshop