final scene
fix for borken meta files
Merge branch 'master' of https://github.com/AlexBoyd/MDMDesignJam

Conflicts:
	DesignJam/Assets/Neighbourhood.unity
	DesignJam/Assets/models.meta~FETCH_HEAD
	DesignJam/DesignJam-csharp.sln
	DesignJam/DesignJam.sln
deleting broken meta files
Merge branch 'master' of https://github.com/AlexBoyd/MDMDesignJam

Conflicts:
	DesignJam/Assembly-CSharp-vs.csproj
	DesignJam/Assembly-CSharp.csproj
	DesignJam/Assets/Neighbourhood.unity
	DesignJam/Assets/models.meta~HEAD
	DesignJam/DesignJam-csharp.sln
	DesignJam/DesignJam.sln
	DesignJam/DesignJam.userprefs
Merge branch 'master' of https://github.com/AlexBoyd/MDMDesignJam

Conflicts:
	DesignJam/Assembly-CSharp-vs.csproj
	DesignJam/Assembly-CSharp.csproj
	DesignJam/Assets/Neighbourhood.unity
	DesignJam/Assets/OVR/OVRImageEffects.meta
	DesignJam/Assets/models.meta~FETCH_HEAD
	DesignJam/Assets/models.meta~HEAD
	DesignJam/DesignJam-csharp.sln
	DesignJam/DesignJam.sln
	DesignJam/DesignJam.userprefs