Olivia added background image to resources folder
Merge origin/master

Conflicts:
	SpaceTrader/nbproject/project.properties