spam
spam
Merge branch 'master' of https://github.com/dp0304/dp0304.github.com

Conflicts:
	_posts/2014-07-03-long-life.md