made a few styling changes
Merge branch 'master' into locations2
working on rendering all locations on homepage map
resolved merge conflict in locations show.html.erb