Boss + 2 enemies
Merge remote-tracking branch 'remotes/origin/Enemy-anim-(Marc)'

Conflicts:
	ProjectTraining2&3/Assembly-CSharp-vs.csproj
	ProjectTraining2&3/Assembly-CSharp.csproj
	ProjectTraining2&3/Assets/Resource/Enemy/KnightController.controller
	ProjectTraining2&3/Assets/Scenes/Stage1.unity
	ProjectTraining2&3/Library/CurrentLayout.dwlt
	ProjectTraining2&3/Library/ScriptAssemblies/Assembly-CSharp.dll
	ProjectTraining2&3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ProjectTraining2&3/Library/assetDatabase3
	ProjectTraining2&3/Library/expandedItems
	ProjectTraining2&3/Library/guidmapper
	ProjectTraining2&3/ProjectTraining2&3-csharp.sln
	ProjectTraining2&3/ProjectTraining2&3.sln
	ProjectTraining2&3/ProjectTraining2&3.userprefs
Enemies Boss
scene pour mobs
meta data
Merge branch 'master' of https://github.com/Katasa/ProjectTraining2-3
Merge remote-tracking branch 'remotes/origin/Enemy-anim-(Marc)'

Conflicts:
	.gitignore
	ProjectTraining2&3/Assets/Resources/Enemy.meta
	ProjectTraining2&3/Assets/Resources/Enemy/KnightStand.anim
	ProjectTraining2&3/Assets/Resources/Enemy/KnightWalk.anim
	ProjectTraining2&3/Assets/Resources/Enemy/knight stand.png
	ProjectTraining2&3/Assets/Resources/Enemy/knight.png
	ProjectTraining2&3/Assets/Scenes/Stage1.unity
	ProjectTraining2&3/Library/CurrentLayout.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/ProjectTraining2&3-csharp.sln
	ProjectTraining2&3/ProjectTraining2&3.sln