update func1
Merge remote-tracking branch 'origin/master'

Conflicts:
	main/main/main.cpp