Merge branch 'master' of https://github.com/M-Anwar/4Pong

Conflicts:
	build/built-jar.properties
	build/classes/Engine/JavaBackgroundMusic.class
	build/classes/Engine/JavaSoundEffects.class
	build/classes/Entity/MenuBall.class
	build/classes/G4Pong/GamePanel.class
	build/classes/GUI/Component.class
	build/classes/GameStates/IntroState$3.class
	build/classes/GameStates/IntroState.class
	build/classes/GameStates/SinglePlayerGame.class
	build/classes/GameStates/TestBench$1.class
	build/classes/GameStates/TestBench$2.class
	build/classes/GameStates/TestBench.class
	dist/4Pong.jar