imatges
Merge branch 'master' of https://github.com/gemma-ferreras/VJ2D---OutZone

Conflicts:
	2DEngine.sdf
	2DEngine.v11.suo
	Debug/2DEngine.exe
	Debug/2DEngine.ilk
	Debug/2DEngine.log
	Debug/2DEngine.pdb
	Debug/CL.write.1.tlog
	Debug/GLUTMain.obj
	Debug/Shoot.obj
	Debug/cBicho.obj
	Debug/cGame.obj
	Debug/cPlayer.obj
	Debug/cScene.obj
	Debug/vc110.idb
	Debug/vc110.pdb
	cBicho.cpp