#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
Added_migration_files #234
Merge pull request #271 from Saftophobia/C3_Sandra_migration_files_#234

Added_migration_files #234
Created the website layout by changing the application.html file and adding all the stylesheets and javascripts
Modified the indentation of the application.html
Modified the documentation of the javascripts and stylesheets and deleted the twitter folder
Merge pull request #272 from Saftophobia/C1_Samar_Website_Layout_#260

Pull request C1 samar Website Layout #260
Update maps_controller.rb
Update maps_controller.rb
Update maps_controller.rb