Updating main branch

Creating a pull request for commenting ability
Also, use the format "Feature".equals(geoJsonFile.getString.....) to avoid NullPointerExceptions.