xcxcxcx
Merge branch 'gal'
Merge branch 'master' of https://github.com/oferpaster/RT_Game.git

Conflicts:
	src/gui/Ball.java
	src/gui/GUIBackground.java