Testing pycharm sync
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/pcresolver/my-projects

Conflicts:
	test (2).py