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

Conflicts:
	_posts/2014-05-02-mtmemo.md