post update
Merge branch 'master' of https://github.com/cdpython/cdpython.github.io

Conflicts:
	_posts/2014-12-17-first.md