Add diibadaaba
Merge branch 'master' of https://github.com/tume91/git_harjoitus

Conflicts:
	hei.txt
Add fuuuuu

Merge branch 'master' of https://github.com/tume91/git_harjoitus Conflicts: hei.txt