lõplik
txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	Untitled.py
Revert "lõplik"

This reverts commit c9956595c91fd7a24ce39a0c62b5603ef6e402a5.
Merge branch 'master' of https://github.com/krisseliine/KrisseKirstiprojekt