add 02.
merge
Merge branch 'dev' of github-jeremy:jeremy0123/fetch

Conflicts:
	01.txt
Merge branch 'dev-local'

Conflicts:
	01.txt
Merge branch 'dev-local'
11