c2
c2
cambios Jorge
Merge branch 'master' of https://github.com/JGarciaColmenar/ProyectoCompartidoClase

Conflicts:
	Assets/Compartido.js
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
Actualizacion Clase Tarde