new post
Merge branch 'master' of github.com:takady/blog

Conflicts:
	public/atom.xml
	public/blog/categories/rails/atom.xml
	public/blog/categories/ruby/atom.xml
	public/sitemap.xml
remove post