commit now
Merge branch 'master' of github.com:ivezuki/IKOH2

Conflicts:
	.DS_Store
地図増設