Initial commit
Create tiedosto.txt
Merge branch 'master' of github.com:sjsaarinen/ohtu_b

Conflicts:
	README.md