Merging Locations
Merging again

Conflicts:
	views/index.erb