Octopress init
Merge branch 'master' of github.com:atomaka/atomaka.github.io

Conflicts:
	index.html
Site updated at 2014-09-25 04:28:49 UTC