Merge branch 'master' of https://github.com/fencerfan/fencerfan.github.io into source
regenerate
add some plugins
upload posts from WordPress convert to Octpress
upload posts from WordPress convert to Octpress
upload posts from WordPress convert to Octpress