readme
added index.html
Merge branch 'master' of github.com:jacamat/lolita

Conflicts:
	index.html
Carousel stuff