YaleSTC/shifts — pull request #310 by mnquintana (2014-08-20 13:49:26+00:00)
Title: Merge rails-3.2 into master

The time has come. We need to merge this thing to deploy a test instance.