new comic 2012-12-12
archiving old non comic posts
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2007-04-04-rc-delicious.md