adding comments, adding logs
Merge branch 'master' of github.com:ywilkof/Workshop