Enemy Animation
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/Library/guidmapper
	ProjectTraining2&3/Library/metadata/b0/b0fd6e1f22f749542bf1ace92e938e1b
	ProjectTraining2&3/Library/metadata/b1/b1596c2d8c8d3ed49a008d0b69f2b5b2
	ProjectTraining2&3/Library/metadata/b9/b91df5ab41fb9714ab80ceffa422d5d7
	ProjectTraining2&3/Library/metadata/ef/ef54fc56bd7e26242981708b40fc5b68
	ProjectTraining2&3/ProjectTraining2&3-csharp.sln
	ProjectTraining2&3/ProjectTraining2&3.sln
	ProjectTraining2&3/ProjectTraining2&3.userprefs