seuraa2.txt
Merge branch 'haara2' of github.com:hannerasa/ohtu-viikko2 into haara2
kopiomaster.txt
Merge pull request #4 from hannerasa/haara2

Haara2