add 1
add 2
add text02.txt
modified ad 002 branch
modified at master
Merge branch '002'

Conflicts:
	test01.txt
Merge branch 'master' of https://github.com/seafield1979/ios-sample-objectivec into 002

Conflicts:
	test02.txt