corentin (git) - 28/11/2014

Ajout d'une image dans la documentation.
Merge remote-tracking branch 'origin/master'
corentin (git) - 28/11/2014

Passage de la documentation en JFrame.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of /home/coco/DUT_INFO_S3/MilleSabords with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Jeu/Joueur.java
	src/Jeu/View.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
corentin (git) - 28/11/2014

Documentation en JFrame