add time out
Merge branch 'master' of github.com:ProtossJane/MicroBlog