parse time in controller
Merge branch 'challenges' of https://github.com/supertopher/play_dough into events
working
Commit before migration testing
Added phases, week, and day to challenges.  Added Challenges to phases.  Models not updated
Destroy functionality added to edit page
Made delete link red for DANGER!!
Made rake task for setting challenge's default_week to match understood challenge_unit_id
Added red carpet gem
working event creation. One week and One day is one Event Time object. All the times for a given event are associated through the event id.
Made markdown work with redcarpet... suprisingly easily
Changed index to also use markdown parsing
show all times of events on phases pages
Added code highlighting to markdown parser.
Merge branch 'development' into events

Removed unused JS
Removed a reference to surveys from events#create view
Removed unused new.haml
refactored events controller and fixed events views
moved create_challenge link from index
Red to Green