prefab_actual
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Sprites/Nivel3/aire.png.meta
	Assets/Sprites/Nivel3/contenedor.png.meta
	Assets/Sprites/Nivel3/humo.meta
	Assets/Sprites/Nivel3/humo/humo_00000.png.meta
	Assets/Sprites/Nivel3/humo/humo_00001.png.meta
	Assets/Sprites/Nivel3/humo/humo_00002.png.meta
	Assets/Sprites/Nivel3/humo/humo_00003.png.meta
	Assets/Sprites/Nivel3/humo/humo_00004.png.meta
	Assets/Sprites/Nivel3/humo/humo_00005.png.meta
	Assets/Sprites/Nivel3/humo/humo_00006.png.meta
	Assets/Sprites/Nivel3/humo/humo_00007.png.meta
	Assets/Sprites/Nivel3/humo/humo_00008.png.meta
	Assets/Sprites/Nivel3/humo/humo_00009.png.meta
	Assets/Sprites/Nivel3/humo/humo_00010.png.meta
	Assets/Sprites/Nivel3/humo/humo_00011.png.meta
	Assets/Sprites/Nivel3/humo/humo_00012.png.meta
	Assets/Sprites/Nivel3/humo/humo_00013.png.meta
	Assets/Sprites/Nivel3/humo/humo_00014.png.meta
	Assets/Sprites/Nivel3/humo/humo_00015.png.meta
	Assets/Sprites/Nivel3/humo/humo_00016.png.meta
	Assets/Sprites/Nivel3/humo/humo_00017.png.meta
	Assets/Sprites/Nivel3/humo/humo_00018.png.meta
	Assets/Sprites/Nivel3/humo/humo_00019.png.meta
	Assets/Sprites/Nivel3/humo/humo_00020.png.meta
	Assets/Sprites/Nivel3/humo/humo_00021.png.meta
	Assets/Sprites/Nivel3/humo/humo_00022.png.meta
	Assets/Sprites/Nivel3/humo/humo_00023.png.meta
	Assets/Sprites/Nivel3/humo/humo_00024.png.meta
	Assets/Sprites/Nivel3/humo/humo_00025.png.meta
Merge branch 'master' of https://github.com/SilesR/Escav-GameJam

Conflicts:
	Assets/Sprites/Nivel3/aire.png.meta
	Assets/Sprites/Nivel3/contenedor.png.meta
	Assets/Sprites/Nivel3/humo/humo_00000.png.meta
	Assets/Sprites/Nivel3/humo/humo_00001.png.meta
	Assets/Sprites/Nivel3/humo/humo_00002.png.meta
	Assets/Sprites/Nivel3/humo/humo_00003.png.meta
	Assets/Sprites/Nivel3/humo/humo_00004.png.meta
	Assets/Sprites/Nivel3/humo/humo_00005.png.meta
	Assets/Sprites/Nivel3/humo/humo_00006.png.meta
	Assets/Sprites/Nivel3/humo/humo_00007.png.meta
	Assets/Sprites/Nivel3/humo/humo_00008.png.meta
	Assets/Sprites/Nivel3/humo/humo_00009.png.meta
	Assets/Sprites/Nivel3/humo/humo_00010.png.meta
	Assets/Sprites/Nivel3/humo/humo_00011.png.meta
	Assets/Sprites/Nivel3/humo/humo_00012.png.meta
	Assets/Sprites/Nivel3/humo/humo_00013.png.meta
	Assets/Sprites/Nivel3/humo/humo_00014.png.meta
	Assets/Sprites/Nivel3/humo/humo_00015.png.meta
	Assets/Sprites/Nivel3/humo/humo_00016.png.meta
	Assets/Sprites/Nivel3/humo/humo_00017.png.meta
	Assets/Sprites/Nivel3/humo/humo_00018.png.meta
	Assets/Sprites/Nivel3/humo/humo_00019.png.meta
	Assets/Sprites/Nivel3/humo/humo_00020.png.meta
	Assets/Sprites/Nivel3/humo/humo_00021.png.meta
	Assets/Sprites/Nivel3/humo/humo_00022.png.meta
	Assets/Sprites/Nivel3/humo/humo_00023.png.meta
	Assets/Sprites/Nivel3/humo/humo_00024.png.meta
	Assets/Sprites/Nivel3/humo/humo_00025.png.meta