Add NPC and update the dialogue scripting.
Fix merge conflicts.
Merge branch 'master' of https://github.com/lucaswolford/GlobalGameJam2014