Arreglo login
Arreglo gitignore
Merge origin/main into main

Conflicts:
	.gitignore