Arma enemic 2 modificada #391
Merge branch 'dev-sprint5' of https://github.com/eloipuertas/ES2013Dimarts into dev-sprint5