Script_Cambio_Nivel
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Sprites/Nivel2/catapultaANIMADA.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00000.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00001.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00002.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00003.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00004.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00005.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00006.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00007.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00008.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00009.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00010.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00011.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00012.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00013.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00014.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00015.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00016.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00017.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00018.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00019.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00020.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00021.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00022.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00023.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00024.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00025.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00026.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00027.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00028.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00029.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00030.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00031.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00032.png.meta
	Assets/Sprites/Nivel2/catapultaANIMADA/catapulta_00033.png.meta