Finished NPCS

In this commit I finished NPC movement what ertzel started and also
fixed player-npc and npc-npc collisions.