calendar link fixes
Merge branch 'gh-pages' of github.com:cs10/fa14 into gh-pages

* 'gh-pages' of github.com:cs10/fa14:
  disc 8 resources up v2
  disc 8 resources up