Issue #217

Primera aproximacio, a model+arma (rudimentaria)
Merge branch 'Grupo-B' of https://github.com/eloipuertas/ES2013Dimarts into Grupo-B