text edits
Merge branch 'master' into gh-pages

Conflicts:
	inequality2/index.html