first commit

proves commit
Merge branch 'Grupo-A' of https://github.com/eloipuertas/ES2013Dimarts into Grupo-A