Fixed ribbon, moved carousel caption
contd
Merge branch 'master' into gh-pages

Conflicts:
	about.html
	index.html
	services.html
	styles/sasoma.css