.gitignore .meta は無視してはいけません
Merge branch 'master' of https://github.com/manasoft/thedoor

Conflicts:
	Assets/Resources/Images-ja/tx_128_kigou.png.meta
	Assets/Resources/Images-ja/tx_256.png.meta
	Assets/Resources/Images-ja/tx_256_mid.png.meta
	Assets/Resources/Images-ja/tx_32_number.png.meta
	Assets/Resources/Images-ja/tx_512_large.png.meta
	Assets/Resources/Images-ja/tx_room.png.meta