commit de rama1

Signed-off-by: AjotaVargas <ajotavargas@gmail.com>
Signed-off-by: AjotaVargas <ajotavargas@gmail.com>
Signed-off-by: AjotaVargas <ajotavargas@gmail.com>
Merge branch 'rama1'
Signed-off-by: AjotaVargas <ajotavargas@gmail.com>
Signed-off-by: AjotaVargas <ajotavargas@gmail.com>
Merge branch 'rama1'

Conflicts:
	Assets/Escenas/demo.unity

Signed-off-by: AjotaVargas <ajotavargas@gmail.com>
Signed-off-by: AjotaVargas <ajotavargas@gmail.com>