Revert "novo"

This reverts commit e666501f3f65ffbcd8a5447c7f2df13c74a9bc32.
Merge branch 'master' into Marija

Conflicts:
	fajl.txt