Fusion
Merge branch 'master' of github.com:Bm0c/projet_SBS

Conflicts:
	Sunday Bloody Sunday/Sunday Bloody Sunday.suo
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/Game1.cs
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/LecteurMap.cs
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/Map.cs
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/MenuButton.cs
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/ParticuleRain.cs
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/Reseau.cs
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/Ressources.cs
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/Sound.cs
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday.csproj
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/bin/x86/Debug/Content/elevator_music.wma
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/bin/x86/Debug/Content/gameplay_music.wma
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/bin/x86/Debug/Sunday Bloody Sunday.exe
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/bin/x86/Debug/Sunday Bloody Sunday.pdb
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/obj/x86/Debug/ResolveAssemblyReference.cache
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/obj/x86/Debug/Sunday Bloody Sunday.csproj.FileListAbsolute.txt
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/obj/x86/Debug/Sunday Bloody Sunday.exe
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/obj/x86/Debug/Sunday Bloody Sunday.pdb
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody SundayContent/Sunday Bloody SundayContent.contentproj
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody SundayContent/obj/x86/Debug/ContentPipeline.xml
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody SundayContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody SundayContent/obj/x86/Debug/ResolveAssemblyReference.cache
	WindowsGame1/WindowsGame1.suo
	WindowsGame1/WindowsGame1/WindowsGame1/bin/x86/Debug/WindowsGame1.exe
	WindowsGame1/WindowsGame1/WindowsGame1/bin/x86/Debug/WindowsGame1.pdb
	WindowsGame1/WindowsGame1/WindowsGame1/obj/x86/Debug/WindowsGame1.exe
	WindowsGame1/WindowsGame1/WindowsGame1/obj/x86/Debug/WindowsGame1.pdb
	WindowsGame2/WindowsGame2.suo
	WindowsGame2/WindowsGame2/WindowsGame2/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WindowsGame2/WindowsGame2/WindowsGame2Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
FUCHIOOOOON