[orangleliu]..
Merge branch 'master' of https://github.com/orangle/orangle.github.io

Conflicts:
	_posts/2013-12-28-Markdown-testing.md
	_posts/2014-07-15-Use-docker-in-Python-IPython.md