v2 (from 2011)
Merge branch 'v2'

* v2:
  v2 (from 2011)

Conflicts:
	reset.css
trailing whitespace