Updated with next class for May
Updated with next office hour for May
Merge remote-tracking branch 'origin/new-events' into gh-pages

Conflicts:
	web/free-classes/_posts/2013-04-30-github-freeclass.md