teksti juurde
Merge remote-tracking branch 'origin/master'

Conflicts:
	kodune.txt
Merge branch 'master' of https://github.com/rain550/Proovifail