added locationsView
upated
corrected location link name
fixed merge conflicts
test
Merge branch 'locationDetail' of github.com:amler/simple-safari into locationDetail
need to fix locationDetailView
fixed locationDetailView
rendering on page
locationDetailFixed
Merge pull request #5 from amler/locationDetail

Location detail