adapting week 3 hw to this semester
adjust prose a little
Merge branch 'devel'