merge
Merge branch 'master' of https://github.com/Katasa/ProjectTraining2-3

Conflicts:
	ProjectTraining2&3/Assets/Scenes/Stage1.unity
	ProjectTraining2&3/Library/CurrentLayout.dwlt
	ProjectTraining2&3/Library/CurrentMaximizeLayout.dwlt
	ProjectTraining2&3/Library/ScriptAssemblies/Assembly-CSharp.dll
	ProjectTraining2&3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ProjectTraining2&3/Library/assetDatabase3
	ProjectTraining2&3/ProjectTraining2&3-csharp.sln
	ProjectTraining2&3/ProjectTraining2&3.sln
	ProjectTraining2&3/ProjectTraining2&3.userprefs