Change
Merge branch 'master' of https://github.com/fumiwei5/fumiwei5.github.io

Conflicts:
	_posts/2014-02-17-why-i-hate-funnels.md