Deleted
Merge branch 'master' of github.com:mhatta/mhatta.github.io

Conflicts:
	_posts/2014-02-26-test.md