Fixed requirements.txt
Fixed requirements.txt
Fixing requirements, adding Procfile
Changed directory structure
Resolving merge conflicts