Added link to the pull request
Minor update
Fix merge conflict
Lecture 6: Task 1
Merge pull request #65 from tariel/master

Added link to the pull request for task 1
Lecture 6: Task 1
Lecture 6: Task 1
Merge pull request #67 from HeikkiAlanen/master

Lecture 6: Task 1
conflicts