this is b.js
add new js for modal
add image
add carousel
Merge branch 'new'

Conflicts:
	c.js
add merge.js
add merge1.js