sa

sa
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.exe
Merge branch 'master' of https://github.com/ComputerSchool/ComputerSchoolFeladatAutomata