carousel
Merge branch 'dev'
mybe this is my problem
remove jKit for now
Merge branch 'dev'

Conflicts:
	css/style.css