Ajout de javadoc
Merge remote-tracking branch 'origin/master'

Conflicts:
	TP Loft/src/Loft.java