npc world walking

diff --cc include/entities.h
Simple merge

diff --cc include/world.h
Simple merge

diff --cc main.cpp
Simple merge

diff --cc src/ui.cpp
Simple merge

diff --cc src/world.cpp
Simple merge