adding changes from workshop
Merge pull request #6 from doitwithdesign/master

adding changes from workshop