Site updated at 2013-12-28 05:02:21 UTC
Site updated at 2013-12-28 05:23:51 UTC
Site updated at 2013-12-28 06:19:00 UTC
uh oh, merge conflict?
Merge branch 'master' of github.com:Derikulous/derikulous.github.io
Octopress init
Site updated at 2013-12-28 06:24:57 UTC
fix merge conflict
merge conflicts again
merge source
add Rakefile to master
add old post to source
fix merge conflict
merge conflict fixed