2013-01-15 post
Merge branch 'new_post'

* new_post:
  2013-01-15 post
updated tag dir