Merge units into main

# Conflicts:
#   src/level.cpp
#   src/level.hpp
#   src/tile.cpp
#   src/unit.cpp
#   src/unit.hpp