bye
Merge pull request #1 from Corea/corea

Corea
Merge branch 'other'

Conflicts:
	main.py