python base
Merge branch 'master' of https://github.com/ixdfan/ixdfan.github.io

Conflicts:
	_posts/2014-10-28-fontsize
	_posts/2014-10-28-fontsize.markdown
	_posts/2014-10-28-fontsize.md
python base