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

Conflicts:
	Gladiateur/Gladiateur.sln
	Gladiateur/Gladiateur/Gladiateur.csproj
	Gladiateur/Gladiateur/Gladiator.cs
	Gladiateur/Gladiateur/Program.cs
	Gladiateur/Gladiateur/Properties/AssemblyInfo.cs
	Gladiateur/Gladiateur/Team.cs
	Gladiateur/Gladiateur/User.cs
?