Merge branch 'master' of https://github.com/helaaura/MyTripMap

Conflicts:
	app/models/album.rb
	app/models/location.rb
	app/views/maps/index.html.erb
	config/routes.rb
	db/schema.rb
	test/fixtures/albums.yml
Merge branch 'master' of https://github.com/helaaura/MyTripMap

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