init git
Merge branch 'dev' of github.com:johnnow/blog into dev