add_conflict_hj6916
Merge branch 'master' of https://github.com/hj6916/opentutorials_git_hj6916

Conflicts:
	index.html
hj6916_hj6916_2