#416 Parpadeig si ataquen al player
Merge branch 'devel' of https://github.com/eloipuertas/ES2013Dijous into devel