Merge pull request #6 from Anteo4Ever/devAle

Dev ale
Corregido la parte web.
Merge pull request #8 from Anteo4Ever/dev

Dev