Added Settings
Merge branch 'Settings'
Merge branch 'master' of https://github.com/Groep4-HvA/GuiLuggage

Conflicts:
	src/main/java/main/MainGuiFrame.java