Merge pull request #2 from jjaspe/master

Update gh-pages
Update main.css

Hide inactive slides
Update main.css

Show active slide
Update index.html
Merge pull request #3 from jjaspe/carousel

Carousel
Update index.html

Added background as another slide
Merge branch 'carousel'
Merge branch 'master' into carousel
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	main.css