just some changes
update
Merge branch 'master' of https://github.com/GinSmile/first_test_rep
added a todo and modified hellp.py
change some lines
Merge branch 'experiment'
ok
okok
Merge branch 'experiment'

Conflicts:
	hello.py