Lecture 6, task 1: added link to pull request.
Fixed merge conflicts.
Merge pull request #66 from Oona/master

Lecture 6, task 1: added link to pull request.