x'x'x
Merge branch 'blog-1.0' of github.com:peterae86/G-blog into blog-1.0