Oh que Oui ! C'est Noël, Alors JOYEUX NOEL ! The Dead's Memories se met aux chants de Noël
Merge branch 'master' of https://github.com/TheDeadMemoriesTeam/TheDeadMemories

Conflicts:
	Assets/Scenes/testScene.unity
	Assets/Scripts/AudioManager.cs
modifie le AudioManager (il y avait notamment des soucis avec les boutons des options de la pause)
Merge branch 'master' of https://github.com/TheDeadMemoriesTeam/TheDeadMemories

Conflicts:
	Assets/Scenes/testScene.unity
	Assets/Standard Assets/Water (Pro Only)/Sources/Materials/Daylight Water.mat