Update README.md
merge with no -ff
bug clean
merge bug fixed 101
find bug
bug fixed
a
fixed
Merge branch 'master' of github.com:johnnow/blog
Delete LICENSE
Delete baby.txt
Delete tet
Merge branch 'master' of github.com:johnnow/blog
Update README.md
Merge branch 'dev'

Conflicts:
	tet
bare github