Merge pull request #1 from whroman/master

merging latest
Merge pull request #4 from whroman/gh-pages

better formatting for table
new hangout link
week 6 and 7
added javadoc
added javadoc
typo
Week 7 and 8
new material
more links
office hours update
update
Update office hours and add forum link
Merge branch 'master' into gh-pages

Conflicts:
	index.html
fix teacher email address
New content
added content for week 10
homework wk 10
remove dupe link
FracCalc starteer code