Merge remote-tracking branch 'origin/plan_comment' into plan_comment
Merge remote-tracking branch 'origin/plan_comment' into plan_comment
Add comment form

Modified:   controllers/plans_controller.rb
Modified:   views/plans/show.html.haml