rolling back

wouldnt let me commit a change so trying to debug
rolling back
Merge branch 'master' of https://github.com/jchild/UCMerced_TimeTables