refactors and updates map portion of the renting project
moves index file to the version on the master branch
fixes conflicts with the different branches on the renting in la project
Merge pull request #11 from SCPR/dev-renting

Address conflicts between two branches of the renting project and implements refactor of data and map code