merge + new skill
Merge branch 'flo' of
ssh://git@github.com/Hralien/libgdx-kryonet-chat.git into flo

Conflicts:
	tutoBatailleNavale/src/m4ges/models/Personnage.java