swap labs
Merge branch 'master' of github.com:cs10/fa14

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