checkin from robertjmcinnis
Conflicts:
	index.html
Merge branch 'gh-pages' of https://github.com/robertjmcinnis/gfree into gh-pages