Missing preposition in Office Hour aftermath blurb
Merge branch 'gh-pages' into hyphens

Conflicts:
	web/free-classes/_posts/2013-05-19-office-hour.md