primera prueba
resolver principal
Merge branch 'master' of https://github.com/agustincl/anguilaperro

Conflicts:
	README.md
Merge branch 'master' of https://github.com/agustincl/anguilaperro
Merge branch 'master' of https://github.com/agustincl/anguilaperro
Merge branch 'master' of https://github.com/agustincl/anguilaperro
Merge branch 'master' of https://github.com/agustincl/anguilaperro
Merge branch 'master' of https://github.com/agustincl/anguilaperro
Merge pull request #3 from tcivera/master

Database parametic tables data
Database dump
backend
Merge pull request #5 from AnikaEDC/master

Backend
Index controller to class
Merge pull request #6 from alexis1704/master

Index controller to class
Merge
New controller logic