DSStore Deleted
Merge branch 'master' into TakuyaDev
mapの改善

プレイヤーを動かした際の待ち時間を追加
Merge branch 'TakuyaDev'

Conflicts:
	proj.ios/.DS_Store