Merge remote-tracking branch 'origin/master'
Probando git...
Merge branch 'master' of https://github.com/Arquisoft/Entrecine5
Probando one more time...