before the rebase
before the rebase
updated map page
Merge branch 'frontendstuff' of github.com:mejackreed/atlantastreetmap into frontendstuff

Conflicts:
	Gemfile
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	app/views/main/index.html.erb
Merge pull request #1 from mejackreed/frontendstuff

Frontendstuff