Incorporacio de mes vides a l'escena
Merge branch 'devel' of https://github.com/eloipuertas/ES2013Dijous into devel