????
Merge branch 'master' of https://github.com/G-Tim/MISparta

Conflicts:
	Gladiateur/Gladiateur/Equipment/Equipment.cs
	Gladiateur/Gladiateur/Equipment/EquipmentAttack.cs
	Gladiateur/Gladiateur/Equipment/EquipmentBoth.cs
	Gladiateur/Gladiateur/Equipment/EquipmentDefense.cs
	Gladiateur/Gladiateur/Gladiateur.csproj