First scaffold of resistencias
update nora & iván
Merge branch 'master' of github.com:Borja/herosinatra
Merge branch 'master' of github.com:IrisGaleano/herosinatra
update hoplita