update
Merge branch 'master' of https://github.com/tacahilo/blog

Conflicts:
	Gemfile.lock