Merge pull request #2 from ingjaso/master

config
Merge pull request #4 from ingjaso/master

config
Merge pull request #5 from ingjaso/master

Actualizacion
Merge pull request #3 from ingjaso/master

Merge Alejandro
Merge pull request #14 from AkaAnto/master

pull request
Smarty mas ejemplo de controlador y template base
Merge pull request #20 from davidpoveda89/master

Merge pull request #4 from ingjaso/master
Merge pull request #21 from AkaAnto/master

Smarty mas ejemplo de controlador y template base
Merge pull request #19 from penajose10/master

alters
Merge pull request #5 from ingjaso/master

alters y controladora