Fixed enemy
Merge branch 'master' of https://github.com/alemuro/-UPC--VJ--Videojoc-2D

Conflicts:
	cObject.h