first crack
fixed merge things
rough draft of npc conversations
trying to get multiple strings conversations
NPC conversation work
Merge branch 'master' of https://github.com/ZeroXFive7/Ludum-Dare-28
Merge branch 'npc'