reimported sun

Reimported the sun
Merge remote-tracking branch 'origin/master'

Conflicts:
	PurpleMonkeyJam.gmx/PurpleMonkeyJam.project.gmx