my changes
Merge branch 'gh-pages' of https://github.com/composure/site2 into gh-pages

Conflicts:
	stylesheets/screen.css