creating new branch
creating new branch
Merge branch 'feature/CT/time_filling_qs' of github.com:ucberkeley/moocchat into feature/CT/time_filling_qs
added time_filler to activity_schema
setup macro for time filler question
framework for js helper for time filler
basic carousel working
carousel timer filler completely working
delete migration, add time_filler to condition model
time_filler migration added, manually tested
some bug fixes, still broken tests
passing condition model spec
forgot extra condition spec test
all cucumber tests passing
fix all spec tests
jasmine specs for time_filler
added condition time_filler CRUD and cucumber test
Merge branch 'feature/CT/time_filling_qs' of github.com:ucberkeley/moocchat into feature/CT/time_filling_qs
merge time_filler feature