add a new file xx.py
modify the readme.txt by another one
test commit
Merge branch 'dev' of github.com:skf321/gitskills into dev
commit with hehe
give xx a f**k
fix confilict with hehe&f**k