Removed second scale
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/MainMenu.java
	src/OpenGLBoxGame.java