week 5 log 4
Merge branch 'master' of https://github.com/egleiser/DemonParasol