1

1
Merge remote-tracking branch 'origin/master'

Conflicts:
	SecondProject/Library/CurrentLayout.dwlt
	SecondProject/Library/assetDatabase3
	SecondProject/SecondProject-csharp.sln
	SecondProject/SecondProject.sln

	modified:   SecondProject/Assembly-CSharp-vs.csproj
	modified:   SecondProject/Assembly-CSharp.csproj
	modified:   SecondProject/Assets/Scripts/onClickStone.cs
	new file:   SecondProject/Library/ScriptAssemblies/Assembly-CSharp.dll
	modified:   SecondProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	modified:   SecondProject/Library/expandedItems
	modified:   SecondProject/Library/metadata/a9/a9a336adb03ad8048b5631e55340f6f5
	modified:   SecondProject/SecondProject-csharp.sln
	modified:   SecondProject/SecondProject.sln
	modified:   SecondProject/SecondProject.userprefs