ajout mana
Merge remote-tracking branch 'origin/master'

Conflicts:
	warsofbaraxa/bin/Debug/UnityEngine.dll
	warsofbaraxa/bin/Debug/warsofbaraxa.dll
	warsofbaraxa/bin/Debug/warsofbaraxa.pdb
	warsofbaraxa/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	warsofbaraxa/obj/Debug/warsofbaraxa.csproj.FileListAbsolute.txt

	warsofbaraxa/obj/Debug/warsofbaraxa.csprojResolveAssemblyReference.cache
	warsofbaraxa/obj/Debug/warsofbaraxa.dll
	warsofbaraxa/obj/Debug/warsofbaraxa.pdb