tchi

Signed-off-by: Tchi <william.fabre@epita.fr>
Merge branch 'master' of https://github.com/kylox/Templar

Conflicts:
	Templar.suo
	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 jeuContent/obj/x86/Debug/ContentPipeline.xml

Signed-off-by: Tchi <william.fabre@epita.fr>
tchi

Signed-off-by: Tchi <william.fabre@epita.fr>
Merge branch 'master' of https://github.com/kylox/Templar

Conflicts:
	Templar.suo
	debut du jeu/debut du jeu/Reseau/Client.cs

Signed-off-by: Tchi <william.fabre@epita.fr>
tchi

Signed-off-by: Tchi <william.fabre@epita.fr>
Merge branch 'master' of https://github.com/kylox/Templar

Conflicts:
	Templar.suo
	debut du jeu/debut du jeu/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	debut du jeu/debut du jeuContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	debut du jeu/debut du jeuContent/obj/x86/Debug/ResolveAssemblyReference.cache

Signed-off-by: Tchi <william.fabre@epita.fr>
tchi

Signed-off-by: Tchi <william.fabre@epita.fr>
Merge branch 'master' of https://github.com/kylox/Templar

Conflicts:
	Templar.suo
	debut du jeu/debut du jeu/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	debut du jeu/debut du jeuContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Signed-off-by: Tchi <william.fabre@epita.fr>
tchi

Signed-off-by: Tchi <william.fabre@epita.fr>
Merge branch 'master' of https://github.com/kylox/Templar

Conflicts:
	Templar.suo
	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.exe
	debut du jeu/debut du jeu/obj/x86/Debug/Templar.pdb

Signed-off-by: Tchi <william.fabre@epita.fr>