borrando main.pyc
confiroetrg

Conflicts:
	main.py
	main.pyc
errtetertte