build
Update 2014-10-15-docker-tips.html
build
Merge branch 'gh-pages' of github.com:fanyeren/fanyeren.github.io into gh-pages

Conflicts:
	_site/atom.xml
	_site/rss.xml