delete file
add file
folder

create folder
add folder
delete

deletefolder
.DS_Store追加
Merge branch 'master' of https://github.com/iichin0708/ScrollAndPickUp

Conflicts:
	.DS_Store
画像ファイル追加
DS_Store