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

Conflicts:
	Gladiateur/Gladiateur/Gladiateur.csproj
	Gladiateur/Gladiateur/Item.cs
	Gladiateur/Gladiateur/Stuff.cs