Merge pull request #1 from jvcerver/master

mira a ver que la hemos mangao
Merge pull request #2 from jvcerver/master

Implementación de la barra
Merge pull request #3 from caherfe/master

Barra + pelota rebota