3
Merge branch 'master' of https://github.com/DemetriPirpiris/TripLog-TC359-GroupProject

Conflicts:
	app/views/locations/index.html.erb
r
4
6
style changes