Initial commit
adsf
aaaaa
Merge branch 'master' of github.com:OssianL/ohtu-b

Conflicts:
	README.md
viikko 2 kansio