Site updated.
New post.
Merge branch 'master' of heroku.com:skratch

Conflicts:
	public/archives/index.html
	public/atom.xml
	public/blog/archives/index.html
	public/blog/index.html
	public/categories/1click/atom.xml
	public/categories/2click/atom.xml
	public/categories/3click/atom.xml
	public/categories/baby/atom.xml
	public/categories/battle/atom.xml
	public/categories/boomerang/atom.xml
	public/categories/chirp/atom.xml
	public/categories/chirps/atom.xml
	public/categories/combo/atom.xml
	public/categories/crab/atom.xml
	public/categories/crescent/atom.xml
	public/categories/cutmandoo/atom.xml
	public/categories/delayed/atom.xml
	public/categories/deska/atom.xml
	public/categories/diy/atom.xml
	public/categories/double/atom.xml
	public/categories/drill/atom.xml
	public/categories/drumming/atom.xml
	public/categories/dstyles/atom.xml
	public/categories/excess/atom.xml
	public/categories/fader/atom.xml
	public/categories/faderless/atom.xml
	public/categories/flare/atom.xml
	public/categories/freestyle/atom.xml
	public/categories/hamster/atom.xml
	public/categories/howto/atom.xml
	public/categories/ida/atom.xml
	public/categories/index.html
	public/categories/isp/atom.xml
	public/categories/jackhammer/atom.xml
	public/categories/joecooley/atom.xml
	public/categories/jrocc/atom.xml
	public/categories/kenone/atom.xml
	public/categories/knuckle/atom.xml
	public/categories/kouji/atom.xml
	public/categories/lejad/atom.xml
	public/categories/live/atom.xml
	public/categories/miyajima/atom.xml
	public/categories/orbit/atom.xml
	public/categories/orbits/atom.xml
	public/categories/prizm/atom.xml
	public/categories/qbert/atom.xml
	public/categories/rafik/atom.xml
	public/categories/reverse/atom.xml
	public/categories/sandwich/atom.xml
	public/categories/shortkut/atom.xml
	public/categories/shrimp/atom.xml
	public/categories/snake/atom.xml
	public/categories/spair/atom.xml
	public/categories/spin/atom.xml
	public/categories/tape/atom.xml
	public/categories/tear/atom.xml
	public/categories/toadstyle/atom.xml
	public/categories/transformer/atom.xml
	public/categories/ttm/atom.xml
	public/categories/tyra/atom.xml
	public/categories/yocchi/atom.xml
	public/categories/zo/atom.xml
	public/index.html
	public/sitemap.xml