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