added gzip
resloved conflicts in app.py