commit before pull
made a lot of changes mostly to NPC and Question classes