GenericTest
Merge branch 'solo_play' of https://github.com/Arquisoft/Entrecine1 into solo_play