added final things
...
Merge branch 'Parte-Roxanne'

Conflicts:
	Assets/New Terrain.asset
	Assets/scenes/main.unity
	Assets/scripts/Illusion.cs
	Assets/scripts/OasisFactory.cs
	Assets/scripts/Zona.cs