Merge pull request #2 from kevjhos/featuredKev01

merge featurekev  to develop
cambios en test.coffe
conflicto funciones test.coffe