Merge pull request #1 from huytranpdx/huy

Huy
put place holder images in image folder, added carousel container and indicators
added images to index.html
added slider icons
contained all carousel elements
added captions
adjusted carousel.jpg sizes
made small adjustments and changed them back
Merge pull request #2 from huytranpdx/amyvs

Amyvs
Merge branch 'master' into huy
Merge branch 'huy'
merge conflict
fixed merge conflicts
fixed merge