Testing commit from PyCharm
Merge branch 'master' of github.com:tenach/scrib

Conflicts:
	core/scrib.py