committing again
Adding back files that merging ate.
Merge branch 'gh-pages'

Conflicts:
	gold/css/style.css