adding google maps
moving google maps to analysis, added convert method
lined in geo_region to analysis map
merge error
add fake data and heatmap displaying data
added migration'
merged master
Merge pull request #13 from kyruscharities/saubert

Saubert
Merge branch 'master' into john-analyze

Conflicts:
	app/views/analyses/show.html.haml
db migrate