1
Merge branch 'master' of https://github.com/yatagan/test_project

Conflicts:
	hello.py