Merge branch 'mify21'
Merge branch 'mify21'
Merge branch 'mify21'
Merge branch 'mify21'
no adjust
Merge branch 'mify21'

Conflicts:
	img/01.jpg
adjustment
Merge branch 'mify21'
Merge branch 'mify21'
Merge branch 'mify21'
test
adjust name
corrected problems
Merge branch 'master' into mify21

Conflicts:
	img/01.jpg