Still test commit
commit to merge
Merge branch 'gustavo' into ‘master’

Conflicts:
	Assets/Audio.meta
	Assets/Materials.meta
	Assets/Models.meta
	Assets/Prefabs.meta
	Assets/Textures.meta
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	ProceduralCityUnity-csharp.sln
	ProceduralCityUnity.sln
Introducing building scene
Building's quadrilateral shape being generated
Box update
Stacking floors dynamically
Fixing variable names
Moduling functions
Creating some different buildings
Triangulation start
Meta files for folder structure
Merge branch 'master' into gustavo

Conflicts:
	Library/assetDatabase3
	Library/guidmapper
	ProceduralCityUnity-csharp.sln
	ProceduralCityUnity.sln
Building floors unbinding and format variation
Triangulation attempt