Merge origin/master

Conflicts:
	src/main/GameWindowFrameController.java

Adding a JLabel on the front that shows the slider value.