ignore zip files
fix merge
add all of charlotte's download and summarise code