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

Conflicts:
	src/options.ini
finishGame
Merge branch 'dev' of github.com:mbret/jenseits-von-theben into dev
endGame sound