Tchi

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