commit avant pull
Merge branch 'dev' of github.com:mbret/jenseits-von-theben into david

Conflicts:
	src/main/java/com/miage/game/Sound.java

	deleted:    .idea/compiler.xml
	modified:   src/main/java/com/miage/game/Board.java
new file:   src/main/java/com/miage/game/Sound.java
	modified:   src/main/java/com/miage/gui/FrameMain.java
	modified:   src/main/java/com/miage/gui/FrameMain_MapPanel.java
	modified:   src/main/java/com/miage/gui/PanelHome.form
	modified:   src/main/java/com/miage/gui/PanelHome.java
sound stop
Merge branch 'dev' of github.com:mbret/jenseits-von-theben into david
sound in options
les sone deja fouillé sont mis a jour apres une annee
Merge branch 'dev' of github.com:mbret/jenseits-von-theben into david

Conflicts:
	src/main/java/com/miage/gui/PanelHome.form
	src/main/java/com/miage/gui/PanelHome.java
	src/options.ini
Merge branch 'dev' of github.com:mbret/jenseits-von-theben into dev

Conflicts:
	src/main/java/com/miage/gui/PanelHome.form
	src/main/java/com/miage/gui/PanelHome.java
	src/options.ini
commit avant pull
sound fixed
Merge branch 'david' into dev

Conflicts:
	src/main/java/com/miage/gui/PanelHome.form
	src/main/java/com/miage/gui/PanelHome.java
commit avant pull richard
Merge branch 'richard' of https://github.com/mbret/jenseits-von-theben into dev
option ini fixed
fixed sound 2
fixed sound 2
resolution conflit avec david
Merge branch 'dev' of github.com:mbret/jenseits-von-theben into dev
resolution conflit avec david
Merge branch 'dev' of github.com:mbret/jenseits-von-theben into dev

Conflicts:
	src/main/java/com/miage/gui/PanelHome.java