Mark Otto 5b02dbd97a Merge branch 'master' into docs_derp ...

Conflicts:
	_config.yml

2013-12-26 21:40:15 -08:00

..

default.html

Merge branch 'master' into docs_derp

2013-12-26 21:40:15 -08:00

home.html

more homepage and sidenav overhaul

2013-12-11 22:37:59 -08:00