Fixed carousel caption
Merge branch 'master' of https://github.com/paulinele/gsu

Conflicts:
	.DS_Store
Fixed main.css