Made boring staff table
added cohorts migration
added restful cohorts
Commit before migration testing
Added phases, week, and day to challenges.  Added Challenges to phases.  Models not updated
updated cohorts
added more cohort actions, but need to configure devise so we can create users/establish cohort_ids
working form for updating events and event times
working edit form for phase
cleaner edit and view events, Now you can select all chorots in edit, delete link
Merge branch 'events' of https://github.com/supertopher/play_dough into events
50% back to where it was
cohort wide events on homepage, links to cohort specific events on homepage
create start time in phase migration, add date to form for phase creation
Resolved merge conflict on event_no_nesting.  Chose event changes over others
Added XKCD image to challenges index
Merge branch 'styling' into development
Changed challenges#index layout/style
Challenge#index layout overhaul.  Challenge index style changes
Merge branch 'styling' into development