test03
Merge branch 'branch1'

Conflicts:
	.DS_Store
test05
Merge branch 'master' of https://github.com/TakuYamazaki/Test.git