#71 katana posada al pic de la gallina
Merge branch 'devel-A' of https://github.com/eloipuertas/ES2013Dijous into devel-A