...

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

Conflicts:
	debut du jeu/debut du jeu/jeu/character/joueur/monstre/NPC.cs
mise a jour

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/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: kylox <maxime.gaudron@hotmail.fr>