Changed background
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/background.jpg
	src/engine/Background.java