Merge commit 'e7a2e85c77f6a51e3b92b47ef7845f58ab2afe79' into shimizu/develop
gem mod
Merge commit '022b689465c1fccc6008a2cea8de4d089c522ec5' into shimizu/develop
Merge commit '9ecd9d63b2092e83365d2443d2d63816b886fc4e' into shimizu/develop
add map view
csv download
DS_Store Add
fbログインを途中まで
Merge branch 'shimizu/develop'
Merge branch 'katoh/develop'

Conflicts:
	main.rb
Merge commit '745128eaa4b8ac0117c4824a30d21d61b77545ce' into katoh/develop