Vie et Mort
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/game/Game.cpp
	src/game/Game.hpp
	src/game/Scene.cpp