made a small change so I could push it
cleaning up branch for final pull
resolved final merge conflicts
fixed typo in a carousel image code
Merge pull request #15 from huytranpdx/amyvs

Amyvs