added a scraper to scrape trulia for rental data, parsed data, uploaded to google maps, integrated google maps iframe to display data on home page - NW
fixed merge conflicts
merge conflict