commit267
Merge branch 'master' of github.com:freecoding/ncblog