Octopress init
Site updated at 2013-10-25 03:50:25 UTC
Site updated at 2013-10-25 08:12:43 UTC
Merge remote-tracking branch 'origin/master'

Conflicts:
	atom.xml