task7 is done
task8 in progress
Merge branch 'master' of https://github.com/finch83/Prata