requirements.txt added, base settings modified
merging files