bb

ok
Merge remote-tracking branch 'origin/master' into Verze-2.0

Conflicts:
	main.c