Carousel/Grid Text/Navbar Dropdown

Added carousel and grid text, changed navbar dropdown styling
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/styles.css
	index.html