UPDATE
Merge branch 'master' of github.com:slym-log/slym-log.github.com

Conflicts:
	_posts/2014-04-20-alimentation-barf.md
	index.html
	tags.html