fixed ball size not changing
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/gameEngine.js
	scripts/settings.js