#6 crear prefavs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Juego_Fila_3/Assets/Scenes/Escena_Teresa.unity.meta
	Juego_Fila_3/Assets/Sprites.meta
	Juego_Fila_3/Assets/Sprites/136649889076.png.meta

	Juego_Fila_3/Assets/Sprites/8_bit_metroid_by_nathanmarino-d4nsbxb.png.meta
	Juego_Fila_3/Assets/Sprites/body-parts.png.meta
	Juego_Fila_3/Assets/Sprites/bullet.png.meta
	Juego_Fila_3/Assets/Sprites/chair.png.meta
	Juego_Fila_3/Assets/Sprites/character_ness_walk.png.meta
	Juego_Fila_3/Assets/Sprites/couch.png.meta
	Juego_Fila_3/Assets/Sprites/crate.png.meta
	Juego_Fila_3/Assets/Sprites/desk.png.meta
	Juego_Fila_3/Assets/Sprites/dorm-tiles.png.meta
	Juego_Fila_3/Assets/Sprites/player.png.meta

	Juego_Fila_3/Assets/Sprites/super_metroid_samus_aran_varia_suit_sprites-430x380.png.meta
	Juego_Fila_3/Assets/Sprites/zombie.png.meta
Merge branch 'master' of https://github.com/LomoDorovich/Fila-3