others comments

comments
Merge branch 'master' of https://github.com/juliuspipo/OkinawaSasori

Conflicts:
	carousel.html