working version
Merge branch 'master' of github.com:amleczko/diazo-tutorial