commit before merge
Merge branch 'master' of https://github.com/jaaplallie/MAPSS.git
merge and pull
Merge branch 'master' of https://github.com/jaaplallie/MAPSS.git
merge
Merge branch 'master' of https://github.com/jaaplallie/MAPSS.git

Conflicts:
	MAPSS/bin/Gui/MainWindow.class
	MAPSS/bin/Main/main.class
	MAPSS/src/Backend/ScenarioList.java
	MAPSS/src/Gui/MainWindow.java
fix try