ggfggjgfvh
Merge remote-tracking branch 'origin/master' into gal

Conflicts:
	src/gui/GUIBackground.java
nbfcgfhcfhfbfbcfbc
Merge branch 'master' of https://github.com/oferpaster/RT_Game.git

Conflicts:
	src/gui/Ball.java
	src/gui/GUIBackground.java
Merge remote-tracking branch 'origin/Ofer' into gal

Conflicts:
	src/gui/Ball.java
	src/gui/GUIBackground.java
cvvccv
Merge remote-tracking branch 'origin/gal'
Merge remote-tracking branch 'origin/gal'