Added a 'dummy' NPC
Updated sprite for NPC
Added walking and collision to the NPC
Getting ready for NPC merge
Merge remote-tracking branch 'origin/npc-dev' into aside
Added basic AI to the dummy NPC
Merge remote-tracking branch 'origin/npc-dev' into aside
Merge remote-tracking branch 'origin/aside'