tab strip
inner wrap
pushing index.html
more tabs, aside
fixing conflicts
hello
formatting, smaller tabs
fixed conflicts from farzad
fixed width, #more
css nav
fixed conflicts nav
tab link color, aside color, share buttons
header
smaller tabs, content div includes articles
footer
fixes for firefox