fix
Merge branch 'master' of https://git@github.com/FabienInspiron/lifegame.git
Merge branch 'master' of
https://git@github.com/FabienInspiron/lifegame.git

Conflicts:
	jeux/SettingPanel.java
correction du rapport
correction presentation