fixes
Merge branch 'master' of https://github.com/tilden/tilden.github.io

Conflicts:
	_posts/2014-07-12-Every-smartphone-alarm-clock-app-gets-snooze-wrong.md