added Flask Procfile, gunicorn, and fixed merge conflicts