trying to create a new NPCchat scene
Merge remote-tracking branch 'origin/master' into JuanBranch

Conflicts:
	FinalProject/FinalProject/FinalProject.vcxproj.filters
	FinalProject/src/Scene/NormalScene.cpp