Procfile update.
Added gunicorn to requirements
Added gunicorn to requirements
Added project to pip requirements
Added heroku run file
Updated procfile
Fixed conflicts