asd
Merge remote-tracking branch 'origin/master'

Conflicts:
	Projekt_Kauri_Objekt_Orienteeritud