#321
Merge branch 'Grupo-B' of https://github.com/eloipuertas/ES2013Dimarts into Grupo-B