test
Merge branch 'master' into mify21

Conflicts:
	img/01.jpg
adjustments
Merge branch 'mify21'