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

Conflicts:
	Gladiateur/Gladiateur.userprefs
	Gladiateur/Gladiateur/Gladiator.cs
	Gladiateur/Gladiateur/Program.cs
	Gladiateur/Gladiateur/Team.cs
...
,;:,,;::?./,;/?.:?.:,
///