Münzeinwurf
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ch/zhaw/swengineering/controller/ViewControllerImpl.java
	src/main/java/ch/zhaw/swengineering/view/SimulationView.java
	src/main/java/ch/zhaw/swengineering/view/console/ConsoleSimulationView.java
	src/main/java/ch/zhaw/swengineering/view/gui/GuiSimulationView.java
	src/test/java/ch/zhaw/swengineering/controller/ViewControllerImplTest.java
	src/test/java/ch/zhaw/swengineering/view/console/ConsoleSimulationViewTest.java