NPC moved

Moved NPC to Restaurant. Need to fix movement, collision, and player
colour bug.