Matt's tutorial sucks.
Merge branch 'master' of https://github.com/schultetwin1/masa-tutorial