Add mitä lie
Merge branch 'jokunimi'
Merge branch 'master' of https://github.com/tume91/git_harjoitus

Conflicts:
	joku.txt