#220_get and control the markers on the map
corrected welcome index #220
integration with master #220
 failure scenario implemented #220
Ubit Test implemented #220
implementation and documentation #220
Failure scenario fixed #220
Merge branch 'master' into C3_Alia_control_markers_#220
documentation and scenario fixed #220
documentation fixed #220
Update index.html.erb
Update maps_controller.rb
Update maps_controller.rb
Update maps_controller.rb
Update maps_controller.rb
Update index.html.erb
Merge pull request #269 from Saftophobia/C3_Alia_control_markers_#220

C3 alia control markers #220
Merge branch 'master' of https://github.com/Saftophobia/Sharesoft-14 into C4_AdelBadawy_ChoosePreferences_#226
The extra nil tuples weren't created when preferences were deleted. #226