merge conflicts
Merge branch 'dev' of github.com:Mathias-Gartner/Battle-of-Conquest into dev
main.css remove GIT merge line message