Merge branch 'Josh'
Merge branch 'Josh'
Fixes to CSS

Fixed space after header, added logo to mobile view, and adjusted nav
look.
Merge remote-tracking branch 'origin/matt'
Add link to about page from index
Fixed double index page issue
Fix carousel javascript
Merge branch 'master' into Josh