Merge pull request #96 from HeikkiAlanen/master

Lecture 7, tasks 1&2 done.