Revert "смотри"

This reverts commit 8e275dfb72f3f5d9dea9a06c60aa738f9f939059.
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.cpp