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

Conflicts:
	Gladiateur/Gladiateur.userprefs