Merge pull request #2 from jjaspe/master

Update gh-pages
Merge pull request #3 from jjaspe/carousel

Carousel
Merge remote-tracking branch 'origin/gh-pages'