edm string

Signed-off-by: kylox <maxime.gaudron@hotmail.fr>
Merge branch 'master' of http://github.com/kylox/Templar

Conflicts:
	debut du jeu/debut du jeu/bin/x86/Debug/Content/Music/musiques/01 - niNzo` - Epic feel.wma
	debut du jeu/debut du jeu/bin/x86/Debug/Content/Music/musiques/Butterfly_Tea_-_New_Rise_of_Legend_-_Instru.wma
	debut du jeu/debut du jeu/bin/x86/Debug/Content/Music/musiques/PSICODREAMICS_-_Into_the_Darkness.wma
	debut du jeu/debut du jeu/bin/x86/Debug/Content/Music/musiques/charge of the rohirrim soundtrack.wma
	debut du jeu/debut du jeu/bin/x86/Debug/Templar.exe
	debut du jeu/debut du jeu/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	debut du jeu/debut du jeu/obj/x86/Debug/Templar.exe
	debut du jeu/debut du jeu/obj/x86/Debug/Templar.pdb
	debut du jeu/debut du jeuContent/obj/x86/Debug/ContentPipeline.xml

Signed-off-by: kylox <maxime.gaudron@hotmail.fr>
Merge branch 'master' of http://github.com/kylox/Templar
..

Signed-off-by: kylox <maxime.gaudron@hotmail.fr>
...

Signed-off-by: kylox <maxime.gaudron@hotmail.fr>
Merge branch 'master' of http://github.com/kylox/Templar

Conflicts:
	Templar.suo
	debut du jeu/debut du jeu/EDM/EDM.cs
	debut du jeu/debut du jeu/bin/x86/Debug/Content/Music/musiques/01 - niNzo` - Epic feel.wma
	debut du jeu/debut du jeu/bin/x86/Debug/Content/Music/musiques/Butterfly_Tea_-_New_Rise_of_Legend_-_Instru.wma
	debut du jeu/debut du jeu/bin/x86/Debug/Content/Music/musiques/PSICODREAMICS_-_Into_the_Darkness.wma
	debut du jeu/debut du jeu/bin/x86/Debug/Content/Music/musiques/charge of the rohirrim soundtrack.wma
	debut du jeu/debut du jeu/bin/x86/Debug/Templar.exe
	debut du jeu/debut du jeu/bin/x86/Debug/Templar.pdb
	debut du jeu/debut du jeu/obj/x86/Debug/Templar.csproj.FileListAbsolute.txt
	debut du jeu/debut du jeu/obj/x86/Debug/Templar.exe
	debut du jeu/debut du jeu/obj/x86/Debug/Templar.pdb
	debut du jeu/debut du jeuContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	debut du jeu/debut du jeuContent/obj/x86/Debug/TemplarContent.contentproj.FileListAbsolute.txt

Signed-off-by: kylox <maxime.gaudron@hotmail.fr>
...

Signed-off-by: kylox <maxime.gaudron@hotmail.fr>
Merge branch 'master' of http://github.com/kylox/Templar

Conflicts:
	Templar.suo
last commit

Signed-off-by: kylox <maxime.gaudron@hotmail.fr>