add equipage
create id marin
added getter and setter
added getter and setter for nom and tonnage
added Statut for bateau
added toString
Merge branch 'toString' into Bateau

Conflicts:
	src/org/conde/git/Bateau.java
added class Statut