enemis
Merge branch 'master' of https://github.com/Hereticae/LoZ

Conflicts:
	Debug/Legend of zelda.exe
	Debug/Legend of zelda.ilk
	Debug/Legend of zelda.pdb
	Legend of zelda.sdf
	Legend of zelda.suo
	Legend of zelda/Debug/CL.read.1.tlog
	Legend of zelda/Debug/Entite.obj
	Legend of zelda/Debug/Legend of zelda.log
	Legend of zelda/Debug/Legend of zelda.obj
	Legend of zelda/Debug/Map.obj
	Legend of zelda/Debug/Personnage.obj
	Legend of zelda/Debug/cl.command.1.tlog
	Legend of zelda/Debug/link.command.1.tlog
	Legend of zelda/Debug/link.read.1.tlog
	Legend of zelda/Debug/link.write.1.tlog
	Legend of zelda/Debug/vc100.idb
	Legend of zelda/Debug/vc100.pdb
	ipch/legend of zelda-eb93c540/legend of zelda-8f329c80.ipch
Merge branch 'master' of https://github.com/Hereticae/LoZ