Merge branch 'master' of http://github.com/uguisu-an/blog-app