地図修正
Merge branch 'master' of https://github.com/aruto/sansaku_semi

Conflicts:
	app/views/layouts/map.html.erb