marker logos added
name of cafe shows on map when logo is clicked
conflicts resolved
Merge branch 'development' of github.com:domhacking/project_2_wifinder into development
Merge branch 'card-37' into development