Daves update
Remove map controls
added Google oauth login
Ability allowed
Conflicts merged
Conflicts
Log out button moved
small change to ability
deleted default_images
removed cancan
cafe show list formatted
Merge branch 'development' of github.com:domhacking/project_2_wifinder into card-38
added static map to cafe show page
Merge branch 'development' of github.com:domhacking/project_2_wifinder into card39
Added Seeded data
Added in space in seed data
map markers fixed to show links to cafe/show. styling updated on three container divs. static maps added to cafe show pages
Daves changes
Merge branch 'development'
Daves error on css