#72_my updated controller with conventions and markerbuilder
Merge branch 'master' of https://github.com/Saftophobia/Sharesoft-14 into C3_Alia_show_layers_#72
rendering layers in index with different markers
#72_my last updates of Sprint 1
conflict resolving
modified documentation
implementation modifications
implementation modification #2
implementation modification #3 view
last implementatin modification
conflict resolved
implementation modifications
The map that appears aat signing up, autofocused on Egypt through markers.
this is the same map with a draggable marker so the user would locate their startup on the map
#241 sign up map autofocused on egypt with a draggable marker that changes the url with coordinates
#241 sign up map autofocused on egypt with a draggable marker that changes the url with coordinates
#72_view of the layers
Merge branch 'master' into C3_Alia_show_layers_#72
design of the maps view, map focused on egypt, trial button 4.8_Heba_Abdelfattah_Locate_Startup_at_Signup 4.7_Heba_Abdelfattah_Map_Design #238 #241
resolving conflicts