use zanback
updated
Merge branch 'master' of github.com:tacahilo/blog

Conflicts:
	Gemfile.lock