Merge branch 'master' of https://github.com/billwang1990/billwang1990.github.io into source
setup octopress on MAC