aplicacion final
Merge branch 'solo_play' of https://github.com/Arquisoft/Entrecine1.git into solo_play
aplicacion final