Cambios de materiales... Fixes al bat... etc
Merge branch 'single_player' of https://github.com/nosfex/aztec_treasure into single_player

Conflicts:
	Assets/Game/GameWithDungeon.unity
	Assets/Game/LevelStuff/Furniture/Materials/Pot1.mat
	Assets/Game/LevelStuff/Furniture/Materials/Vines.mat
	Assets/Game/LevelStuff/Furniture/Materials/VinesHeightMap.psd
	Assets/Game/LevelStuff/Furniture/Materials/VinesHeightMap.psd.meta
	Assets/Game/LevelStuff/Furniture/Prefabs/Vines.prefab
	Assets/Game/LevelStuff/WallsFloors/Prefabs/WallTorchTile.prefab
	Assets/Game/LightRamp 2.psd
	Assets/Game/Player/Materials/Flame.mat
	Assets/Game/Player/Materials/FutureGuyv2.mat
	Assets/Shaders/Alpha-Diffuse-Ramp.shader
	Assets/Shaders/Shaders/Alpha-Diffuse-Ramp-Dithering.shader
	Assets/Shaders/Textures/Palettes/system_1.png.meta
	Assets/Shaders/Textures/Patterns/dither_4x4_16_color.png.meta
	Assets/Shaders/Textures/Patterns/tile_4x4_2_color.png.meta
	Assets/Shaders/Textures/Patterns/vertical_16x16_16_color.png.meta