map設置
Merge branch 'master' of https://github.com/HarukaSato/bakappli

Conflicts:
	index.html