add hello.py
Merge branch 'dev' of github.com:qitengfeng/learngit into dev
add new some words
fix conflick kdkdkd