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>
Merge branch 'master' of https://github.com/kylox/Templar
Merge branch 'master' of https://github.com/kylox/Templar
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/Donjon.cs
	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>
Tchi

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

Conflicts:
	Templar.suo
Merge branch 'master' of https://github.com/kylox/Templar

Conflicts:
	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>
Merge branch 'master' of https://github.com/kylox/Templar

Conflicts:
	Templar.suo

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