modify the requirements.txt
Merge remote branch 'origin/master'

Conflicts:
	requirements.txt
remove files