intentoactualizacion2

ffefefef
Merge branch 'master' of https://github.com/emmanuellozoya/blind-gamejam

Conflicts:
	blindgame/Assets/Standard Assets/Toon Shading/Sources/Shaders.meta
	blindgame/Assets/Standard Assets/Toon Shading/Sources/Textures.meta
	blindgame/blindgame.userprefs