Initial commit
first carousel
first carousel
Merge branch 'master' into gh-pages

Conflicts:
	README.md
	index.html
update