Added css stylesheet
css update
Merge remote-tracking branch 'origin/style'

Conflicts:
	style.css