Rius una bona estona. Lo que ve a ser dos hores.
Merge https://github.com/markianet/pelis2
Merge https://github.com/markianet/pelis2
Merge https://github.com/markianet/pelis2
Merge https://github.com/markianet/pelis2

Conflicts:
	pelis.txt

Signed-off-by: gmascaro <daw1gmascaro@iesjoanramis.org>
Provant sort
prova T.T
Merge https://github.com/markianet/pelis2
E afegit avatar