Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma

 Conflicts:
	src/main/java/projekt/enigma/model/Hardware.java
	src/main/resources/projekt/enigma/gui.fxml