Merge pull request #1 from whroman/master

merging latest
Update office hours and add forum link
Merge branch 'master' into gh-pages

Conflicts:
	index.html