option ini fixed
fixed sound 2
fixed sound 2
Merge branch 'dev' of github.com:mbret/jenseits-von-theben into dev
Merge branch 'dev' of github.com:mbret/jenseits-von-theben into dev

Conflicts:
	src/main/java/com/miage/gui/PanelHome.java
Merge branch 'dev' of github.com:mbret/jenseits-von-theben into dev
avant pull
Merge branch 'dev' of github.com:mbret/jenseits-von-theben into david

Conflicts:
	src/main/java/com/miage/gui/PanelHome.java
correction son chronotemps
correction son chronotemps
correction son chronotemps
Merge branch 'david' into dev

Conflicts:
	src/main/java/com/miage/gui/PanelHome.java
move de sound