Octopress init
Site updated at 2014-01-12 16:32:36 UTC
Merge branch 'master' of https://github.com/taudada/taudada.github.io

Conflicts:
	index.html