Work on CSS and carousel
Merge branch 'master' into kenny

Merging changes with John's changes
Merge pull request #23 from kplandes/kenny

Kenny