correccion main.php
gitignore
Merge origin/master