lalalala
Nuevo cambio input
Merge branch 'ceci-task_master'
Merge remote-tracking branch 'esteban-repo/new-feature-shared'
Added new changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	NewFeature.txt
Merge branch 'master' of github.com:Html5Player/WebsiteTest
Merge pull request #10 from cbernat/master

Cambios locales
Merge remote-tracking branch 'upstream/master'
agregado nuevos cambios para probar conflictos
Merge pull request #11 from smurgolo/master

agregado nuevos cambios para probar conflictos