Removed settings
Merge branch 'master' of https://github.com/PorMMo/PorMMo

Conflicts:
	Settings/SD.pmo
	src/main/java/project/senior/app/pormmo/HSBPanel.java
	target/classes/project/senior/app/pormmo/HSBPanel$SliderListener.class
	target/classes/project/senior/app/pormmo/HSBPanel$cButtonListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$FrameListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$MediaControlsButtonListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$MediaControlsCheckBoxListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$MediaControlsSliderListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$PlayerEventListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$UserInterfaceFrameMenuListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame.class
Merge branch 'master' of https://github.com/PorMMo/PorMMo

Conflicts:
	src/main/java/project/senior/app/pormmo/UserInterfaceFrame.java
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$FrameListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$MediaControlsButtonListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$MediaControlsCheckBoxListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$MediaControlsSliderListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$PlayerEventListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$UserInterfaceFrameMenuListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame.class
Updated UserInterfaceFrame
Updated .gitignore