nada
Merge branch 'master' of https://github.com/miguelSantirso/10_seconds_to_live

Conflicts:
	ten_seconds_as/src/ten_seconds_to_live/com/five_ants/ten_secs/InteractiveObject.as
	ten_seconds_as/src/ten_seconds_to_live/com/five_ants/ten_secs/realities/MainReality.as
Merge branch 'master' of https://github.com/miguelSantirso/10_seconds_to_live

Conflicts:
	ten_seconds_as/src/ten_seconds_to_live/com/five_ants/ten_secs/realities/MainReality.as
recuperado
prueba interacciones
Merge branch 'master' of https://github.com/miguelSantirso/10_seconds_to_live
jander
jander
jander