Merge branch 'carousel'

Conflicts:
	_/components/js/bootstrap.js
	_/js/myjs.js
Merge branch 'master' of https://github.com/SokJang/roux_academy

Conflicts:
	_/js/myjs.js