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/IA.cs
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday.csproj.Debug.cachefile
	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/Content/map03.xnb
	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/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 Sunday/obj/x86/Debug/cachefile-{A77547E6-9A2C-4BA1-8C64-E50973B9EA29}-targetpath.txt
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody SundayContent/obj/x86/Debug/ContentPipeline.xml
	WindowsGame1/WindowsGame1/WindowsGame1/obj/x86/Debug/ResolveAssemblyReference.cache
	WindowsGame1/WindowsGame1/WindowsGame1Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WindowsGame1/WindowsGame1/WindowsGame1Content/obj/x86/Debug/ResolveAssemblyReference.cache
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/IA.cs
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody Sunday.csproj.Debug.cachefile
	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/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 Sunday/obj/x86/Debug/cachefile-{A77547E6-9A2C-4BA1-8C64-E50973B9EA29}-targetpath.txt
	Sunday Bloody Sunday/Sunday Bloody Sunday/Sunday Bloody SundayContent/obj/x86/Debug/ContentPipeline.xml
Commit final