resolved merge conflict

.idea/inspectionProfiles/profiles_settings.xml

README.md

...ttgart/battlearena/Controller/CommunityMapController.java

...tgart/battlearena/Controller/CreateAccountController.java

...m_stuttgart/battlearena/Controller/CreditsController.java

.../hdm_stuttgart/battlearena/Controller/Enum/GameState.java

...stuttgart/battlearena/Controller/GameSceneController.java

...hdm_stuttgart/battlearena/Controller/IntroController.java

...tgart/battlearena/Controller/LoadingScreenController.java

...uttgart/battlearena/Controller/LocalCreateController.java

...hdm_stuttgart/battlearena/Controller/LoginController.java

..._stuttgart/battlearena/Controller/MainMenuController.java

..._stuttgart/battlearena/Controller/MapForgeController.java

...ttgart/battlearena/Controller/MapSelectionController.java

...gart/battlearena/Controller/MenuBorderPaneController.java

...hdm_stuttgart/battlearena/Controller/PauseController.java

...tgart/battlearena/Controller/PauseSettingsController.java

...uttgart/battlearena/Controller/PlaceholderController.java

...ttgart/battlearena/Controller/PlayerCreateController.java

..._stuttgart/battlearena/Controller/SettingsController.java