First versions
sotkut selvitetty

Merge github.com:muuankarski/data

Conflicts:
	.gitignore