a
Merge branch 'master' of https://github.com/tarai71/tama

Conflicts:
	Library/assetDatabase3
Merge branch 'master' of https://github.com/tarai71/tama
不要ファイル削除