I changed something using PyCharm
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/requirments.txt
I changed something using PyCharm