osm マップ追加
Merge branch 'master' of https://github.com/srockstyle/instaflip

Conflicts:
	app/views/home/index.html.erb