sdf
Merge branch 'master' of https://github.com/CortoP/Rush01

Conflicts:
	class/Ship.class.php
PUTAIN DE MERDE
Merge branch 'master' of https://github.com/CortoP/Rush01