add dev.py
fix confict and add dev.py
Merge branch 'dev' of github.com:zhangzx/gitLearning into dev