Merge branch 'Ning'

Conflicts:
	Unity Project/Assembly-CSharp-vs.csproj
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Assets/Scenes/ScoreScreen.unity
	Unity Project/Assets/Scenes/Test Scenes/StartScreen.unity
	Unity Project/Assets/Scenes/Test Scenes/StartScreen.unity.meta
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
	Unity Project/Unity Project.userprefs