Merge branch 'testonpi'
typecho
Merge branch 'master' of https://github.com/kururucn/blog