merge

diff --cc include/common.h
Simple merge

diff --cc main.cpp
Simple merge

diff --cc src/gameplay.cpp
Simple merge