committing to re-pull master
Merge branch 'master' into add-markers

Conflicts:
	app/views/centers/show.html.erb
fixing conflicts
added markers
Merge branch 'add-markers'