Corrections from intern walkthrough
Merge branch 'master' of github.com:Trimeego/Barista