updated splash image
fixed sync conflict

Conflicts:
	style.css