need sync
Merge branch 'master' of https://github.com/Samah3ll/BeatBlast

Conflicts:
	BeatBlaster-ver0-0/src/game/screens/GameScreen.java