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

Conflicts:
	ProjectTraining2&3/Assets/Scripts/Ennemy.cs
	ProjectTraining2&3/Library/CurrentMaximizeLayout.dwlt
	ProjectTraining2&3/Library/InspectorExpandedItems.asset
	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/4a/4ab3795af44805c43a1f2b5c36cd348d
	ProjectTraining2&3/Library/metadata/b1/b1596c2d8c8d3ed49a008d0b69f2b5b2
	ProjectTraining2&3/Temp/__EditModeScene