ss

sss
Merge remote-tracking branch 'origin/Verze-2.0'

Conflicts:
	main.c