developはじめました
Merge branch 'develop'

Conflicts:
	study_js.html