Modified p6.18
Added workshop 2 homework exercises