add symlinks
Merge branch 'master' of github.com:cs10/fa14

* 'master' of github.com:cs10/fa14:
  disc 6 update
  disc 6 resources up