add test
Merge branch 'develop'
add post
Merge branch 'master' of https://github.com/erhsh/blog