merge

diff --cc include/common.h
Simple merge

diff --cc include/entities.h
Simple merge

diff --cc src/entities.cpp
Simple merge

diff --cc src/gameplay.cpp
Simple merge

diff --cc src/world.cpp
Simple merge