Test
Merge branch 'master' of https://github.com/Taulita/Tuxbattle

Conflicts:
	sources/confphp/parametres.conf.php