multiple categories
merging
Merge branch 'master' of github.com:ACMCMU/BoredPrototype
Merge branch 'master' of github.com:ACMCMU/BoredPrototype
Merge branch 'master' of github.com:ACMCMU/BoredPrototype
Merge branch 'master' of github.com:ACMCMU/BoredPrototype
Merge branch 'master' of github.com:ACMCMU/BoredPrototype
Merge branch 'master' of github.com:ACMCMU/BoredPrototype
Changed to point to Teudu's local directories, instead of Avesh's
Merge branch 'master' of github.com:ACMCMU/BoredPrototype
Preparing for Shibboleth transition-- safety commit before pull
Merge branch 'master' of github.com:ACMCMU/BoredPrototype