we changed the directory
Merge remote-tracking branch 'origin/master'

Conflicts:
	unit_tests/mystring.py
we changed the directory2